mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up code from tranparency in vcl. Trying setfillcolor from edit attrs

Browse Source 
Change-Id: I263012332e43573f260ac8c54612576eb21a11a1
(cherry picked from commit 02385eb4d8de3c5a57511d8bae3c42a523470838)
This commit is contained in:
matteocam
2014-05-28 17:11:18 -04:00
committed by Fridrich Štrba
parent be34ea6f62
commit 7b59e44925
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editeng/source/editeng/editattr.cxx
View File

@@ -131,6 +131,11 @@ void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
rFont.SetUnderline( (FontUnderline)((const SvxUnderlineItem*)GetItem())->GetValue() ); rFont.SetUnderline( (FontUnderline)((const SvxUnderlineItem*)GetItem())->GetValue() );
if ( pOutDev ) if ( pOutDev )
pOutDev->SetTextLineColor( ((const SvxUnderlineItem*)GetItem())->GetColor() ); pOutDev->SetTextLineColor( ((const SvxUnderlineItem*)GetItem())->GetColor() );
// FIXME(matteocam)
Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF); // blue-ish
if ( pOutDev )
pOutDev->SetTextFillColor(aColor);
} }

9
vcl/source/outdev/text.cxx
View File

@@ -149,14 +149,7 @@ void OutputDevice::ImplDrawTextRect( long nBaseX, long nBaseY,
nX += nBaseX; nX += nBaseX;
nY += nBaseY; nY += nBaseY;
//mpGraphics->DrawRect( nX, nY, nWidth, nHeight, this ); // original code mpGraphics->DrawRect( nX, nY, nWidth, nHeight, this ); // original code
Rectangle aRect( Point( nX, nY ), Size( nWidth+1, nHeight+1 ) );
Polygon aPoly( aRect );
PolyPolygon aPolyPoly(aPoly);
Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF);
SetTextFillColor(aColor);
DrawTransparent(aPolyPoly, 70);
} }