drawinglayer/source/processor2d/vclprocessor2d.cxx | 10 ++++++++++ editeng/source/editeng/editattr.cxx | 2 ++ 2 files changed, 12 insertions(+)
New commits: commit 74fa26c85ef79020a889d14db04130e52635b81e Author: matteocam <[email protected]> Date: Fri Jun 13 17:02:43 2014 +0200 VclProcessor's text rendering looks at fill color Change-Id: I96dcafd01fb6d8a5e873719ee617008b5f2cbc13 diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 7c538ed..7758ed4 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -187,6 +187,16 @@ namespace drawinglayer if( eFontStrikeout != STRIKEOUT_NONE ) 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 FontEmphasisMark eFontEmphasisMark = EMPHASISMARK_NONE; switch( pTCPP->getTextEmphasisMark() ) diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index c867da4..5b9a661 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -246,6 +246,8 @@ EditCharAttribBackgroundColor::EditCharAttribBackgroundColor( 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(); rFont.SetFillColor( aColor); // XXX: Is it SetFillColor we want? _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
