diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-06-16 15:52:24 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:43 +0200 |
| commit | 9ab4387532a9bd0df49f3e619f44108dea952a38 (patch) | |
| tree | 11634e787c19d34e099603197d07dde9d9ec73f7 /drawinglayer | |
| parent | 6c1fc9e94e36b4f74136bc044cc9a4b72f79d53f (diff) | |
Added Text Fill Color in TextDecoratedPrimitive2D
Change-Id: I8c3946c08d20cc2ca2af6f17a2a57d6c9a5cfa23
(cherry picked from commit 00fc45e78d84dddf32b450441bf9028352ec9e52)
Diffstat (limited to 'drawinglayer')
3 files changed, 5 insertions, 1 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 306b0d07e0c2..3e75f56ce1a9 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1293,6 +1293,7 @@ namespace // prepare FontColor and Locale const basegfx::BColor aFontColor(rProperty.getTextColor()); + const basegfx::BColor aBFillColor(rFont.GetFillColor().getBColor()); const com::sun::star::lang::Locale aLocale(LanguageTag(rProperty.getLanguageType()).getLocale()); const bool bWordLineMode(rFont.IsWordLineMode()); @@ -1354,6 +1355,7 @@ namespace aFontAttribute, aLocale, aFontColor, + aBFillColor, // attributes for TextDecoratedPortionPrimitive2D rProperty.getOverlineColorActive() ? rProperty.getOverlineColor() : aFontColor, diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx index f9449a45fef4..10e76c043b90 100644 --- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx +++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx @@ -144,6 +144,7 @@ namespace drawinglayer mrSource.getFontAttribute(), mrSource.getLocale(), mrSource.getFontColor(), + mrSource.getTextFillColor(), pTextDecoratedPortionPrimitive2D->getOverlineColor(), pTextDecoratedPortionPrimitive2D->getTextlineColor(), diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index 8d313841e450..e685ee912c01 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -317,6 +317,7 @@ namespace drawinglayer const attribute::FontAttribute& rFontAttribute, const ::com::sun::star::lang::Locale& rLocale, const basegfx::BColor& rFontColor, + const basegfx::BColor& rFillColor, // local parameters const basegfx::BColor& rOverlineColor, @@ -331,7 +332,7 @@ namespace drawinglayer bool bEmphasisMarkBelow, TextRelief eTextRelief, bool bShadow) - : TextSimplePortionPrimitive2D(rNewTransform, rText, nTextPosition, nTextLength, rDXArray, rFontAttribute, rLocale, rFontColor), + : TextSimplePortionPrimitive2D(rNewTransform, rText, nTextPosition, nTextLength, rDXArray, rFontAttribute, rLocale, rFontColor, false, 0, rFillColor), maOverlineColor(rOverlineColor), maTextlineColor(rTextlineColor), meFontOverline(eFontOverline), |