diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-06-16 15:07:58 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:42 +0200 |
| commit | 6c1fc9e94e36b4f74136bc044cc9a4b72f79d53f (patch) | |
| tree | a0e075cc67d7c2855946667c758f39a2f2799b7e /drawinglayer | |
| parent | 7bb6020ead0494b35967a6876714c2024b1dee4f (diff) | |
Added Text Fill Color in TextSimplePortionPrimitive2D
Change-Id: I40309c17d6e3d0547c4724a01b464e94a3c8a61c
(cherry picked from commit 4177d9b34551f7cf2a7ea8d2dfdff37b89400db4)
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/primitive2d/textprimitive2d.cxx | 6 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index f35015ac1607..4aba22d40a14 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -228,7 +228,8 @@ namespace drawinglayer const ::com::sun::star::lang::Locale& rLocale, const basegfx::BColor& rFontColor, bool bFilled, - long nWidthToFill) + long nWidthToFill, + const basegfx::BColor& rFillColor) : BufferedDecompositionPrimitive2D(), maTextTransform(rNewTransform), maText(rText), @@ -240,7 +241,8 @@ namespace drawinglayer maFontColor(rFontColor), maB2DRange(), mbFilled(bFilled), - mnWidthToFill(nWidthToFill) + mnWidthToFill(nWidthToFill), + maTextFillColor(rFillColor) { #if OSL_DEBUG_LEVEL > 0 const sal_Int32 aStringLength(getText().getLength()); diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 213b51499e5e..54aef7426101 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -189,18 +189,16 @@ namespace drawinglayer // set FillColor Attribute // FIXME(matteocam) - // XXX: is "Color" the right type - //const Color aFillColor(pTCPP->getFontFillColor() ); - //if( aFillColor != COL_TRANSPARENT ) - // set fill Color if underlined - if ( eFontUnderline != UNDERLINE_NONE ) + // XXX: is "Color" the right type? i.e. can we use class Color in TextSimplePortionPrimitive2D + const Color aFillColor(pTCPP->getTextFillColor() ); + if( aFillColor != COL_TRANSPARENT ) { - Color aFillColor = RGB_COLORDATA(0x66, 0x66, 0xff); aFont.SetFillColor(aFillColor); aFont.SetTransparent(false); } + // set EmphasisMark attribute FontEmphasisMark eFontEmphasisMark = EMPHASISMARK_NONE; switch( pTCPP->getTextEmphasisMark() ) |