diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-06-13 17:02:43 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:42 +0200 |
| commit | 6b30ff01ea3a4ab7f3fecd7f23bb4782a3f8eb84 (patch) | |
| tree | 68be75ea9270e9e2d4fc70c0000d8f39711acc6b | |
| parent | 4284ad3f27d389a0ac8b5cf57c1b015b44741bec (diff) | |
VclProcessor's text rendering looks at fill color
Change-Id: I96dcafd01fb6d8a5e873719ee617008b5f2cbc13
(cherry picked from commit 74fa26c85ef79020a889d14db04130e52635b81e)
| -rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 10 | ||||
| -rw-r--r-- | editeng/source/editeng/editattr.cxx | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 7c538ed67bb2..7758ed426cd5 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 a0974a238d77..55598e6ae8ea 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? |