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

VclProcessor's text rendering looks at fill color

Browse Source 
Change-Id: I96dcafd01fb6d8a5e873719ee617008b5f2cbc13
(cherry picked from commit 74fa26c85ef79020a889d14db04130e52635b81e)
This commit is contained in:
matteocam
2014-06-13 17:02:43 +02:00
committed by Fridrich Štrba
parent 4284ad3f27
commit 6b30ff01ea
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,6 +187,16 @@ 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
const Color aFillColor(pTCPP->getFillColor() );
if( aFillColor != COL_TRANSPARENT )
{
aFont.SetFillColor(aFillColor);
aFont.SetTransparent(false);
}
// set EmphasisMark attribute // set EmphasisMark attribute
FontEmphasisMark eFontEmphasisMark = EMPHASISMARK_NONE; FontEmphasisMark eFontEmphasisMark = EMPHASISMARK_NONE;
switch( pTCPP->getTextEmphasisMark() ) switch( pTCPP->getTextEmphasisMark() )

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

@@ -246,6 +246,8 @@ EditCharAttribBackgroundColor::EditCharAttribBackgroundColor(
void EditCharAttribBackgroundColor::SetFont( SvxFont& rFont, OutputDevice* ) void EditCharAttribBackgroundColor::SetFont( SvxFont& rFont, OutputDevice* )
{ {
#define BREAK_BKG_COLOR_SET_FONT 0
assert(BREAK_BKG_COLOR_SET_FONT); // XXX: checking if this is being called // FIXME(matteocam)
Color aColor = ((const SvxBackgroundColorItem*)GetItem())->GetValue(); Color aColor = ((const SvxBackgroundColorItem*)GetItem())->GetValue();
rFont.SetFillColor( aColor); // XXX: Is it SetFillColor we want? rFont.SetFillColor( aColor); // XXX: Is it SetFillColor we want?