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

Fill Color in VclProcessor2D is set out of decorated text if-block

Browse Source 
Change-Id: Ice01290d7baa46f694b2bf5801b6af48f083d521
(cherry picked from commit fe0b0c0648a6339f979fe8faa7d997c6b5ac0637)
This commit is contained in:
matteocam 2014-06-17 15:36:41 +02:00 committed by Fridrich Štrba
parent c2d5c39b0c
commit 64de49e9b2
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drawinglayer/source/processor2d/vclprocessor2d.cxx
View File

@ -146,6 +146,14 @@ namespace drawinglayer
fRotate, fRotate,
rTextCandidate.getLocale())); rTextCandidate.getLocale()));
// set FillColor Attribute
const Color aFillColor( rTextCandidate.getTextFillColor() );
if( aFillColor != COL_TRANSPARENT )
{
aFont.SetFillColor(aFillColor);
aFont.SetTransparent(false);
}
// Don't draw fonts without height // Don't draw fonts without height
if( aFont.GetHeight() <= 0 ) if( aFont.GetHeight() <= 0 )
return; return;
@ -187,17 +195,6 @@ namespace drawinglayer
if( eFontStrikeout != STRIKEOUT_NONE ) if( eFontStrikeout != STRIKEOUT_NONE )
aFont.SetStrikeout( eFontStrikeout ); aFont.SetStrikeout( eFontStrikeout );
// set FillColor Attribute
// FIXME(matteocam)
// XXX: is "Color" the right type? i.e. can we use class Color in TextSimplePortionPrimitive2D
const Color aFillColor(pTCPP->getTextFillColor() );
if( aFillColor != COL_TRANSPARENT )
{
aFont.SetFillColor(aFillColor);
aFont.SetTransparent(false);
}
// set EmphasisMark attribute // set EmphasisMark attribute
FontEmphasisMark eFontEmphasisMark = EMPHASISMARK_NONE; FontEmphasisMark eFontEmphasisMark = EMPHASISMARK_NONE;