diff options
6 files changed, 18 insertions, 11 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 3e75f56ce1a9..dc922b5a4759 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1293,7 +1293,7 @@ namespace // prepare FontColor and Locale const basegfx::BColor aFontColor(rProperty.getTextColor()); - const basegfx::BColor aBFillColor(rFont.GetFillColor().getBColor()); + const Color aFillColor(rFont.GetFillColor()); const com::sun::star::lang::Locale aLocale(LanguageTag(rProperty.getLanguageType()).getLocale()); const bool bWordLineMode(rFont.IsWordLineMode()); @@ -1355,7 +1355,7 @@ namespace aFontAttribute, aLocale, aFontColor, - aBFillColor, + aFillColor, // attributes for TextDecoratedPortionPrimitive2D rProperty.getOverlineColorActive() ? rProperty.getOverlineColor() : aFontColor, diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index e685ee912c01..d04f693ec65d 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -317,7 +317,7 @@ namespace drawinglayer const attribute::FontAttribute& rFontAttribute, const ::com::sun::star::lang::Locale& rLocale, const basegfx::BColor& rFontColor, - const basegfx::BColor& rFillColor, + const Color& rFillColor, // local parameters const basegfx::BColor& rOverlineColor, diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index 4aba22d40a14..b825a82bdd2e 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -229,7 +229,7 @@ namespace drawinglayer const basegfx::BColor& rFontColor, bool bFilled, long nWidthToFill, - const basegfx::BColor& rFillColor) + const Color& rFillColor) : BufferedDecompositionPrimitive2D(), maTextTransform(rNewTransform), maText(rText), diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index 5732f3c33761..d33ee9e56828 100644 --- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -94,7 +94,7 @@ namespace drawinglayer const attribute::FontAttribute& rFontAttribute, const ::com::sun::star::lang::Locale& rLocale, const basegfx::BColor& rFontColor, - const basegfx::BColor& rFillColor, + const Color& rFillColor, /// local parameters const basegfx::BColor& rOverlineColor, diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index 7c812b4273eb..bb8dd1a21343 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -89,6 +89,14 @@ namespace drawinglayer @param rFontColor The font color to use + + @param bFilled + + @param nWidthToFill + + @param rFillColor + Text background color (has nothing to do with bFilled and nWidthToFill) + */ class DRAWINGLAYER_DLLPUBLIC TextSimplePortionPrimitive2D : public BufferedDecompositionPrimitive2D { @@ -124,7 +132,7 @@ namespace drawinglayer long mnWidthToFill; // the width to fill /// The fill color of the text - basegfx::BColor maTextFillColor; + Color maTextFillColor; protected: /// local decomposition. @@ -143,7 +151,7 @@ namespace drawinglayer const basegfx::BColor& rFontColor, bool bFilled = false, long nWidthToFill = 0, - const basegfx::BColor& rFillColor = Color(COL_TRANSPARENT).getBColor()); + const Color& rFillColor = COL_TRANSPARENT ); /// helpers /** get text outlines as polygons and their according ObjectTransformation. Handles all @@ -160,7 +168,7 @@ namespace drawinglayer const attribute::FontAttribute& getFontAttribute() const { return maFontAttribute; } const ::com::sun::star::lang::Locale& getLocale() const { return maLocale; } const basegfx::BColor& getFontColor() const { return maFontColor; } - const basegfx::BColor& getTextFillColor() const { return maTextFillColor; } + const Color& getTextFillColor() const { return maTextFillColor; } bool isFilled() const { return mbFilled; } long getWidthToFill() const { return mnWidthToFill; } diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index cb49a50831d3..2f7c4e1dfede 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -260,7 +260,6 @@ namespace const basegfx::BColor aBFontColor(aFontColor.getBColor()); const Color aTextFillColor(rInfo.mrFont.GetFillColor()); - const basegfx::BColor aBTextFillColor(aTextFillColor.getBColor()); // prepare wordLineMode (for underline and strikeout) // NOT for bullet texts. It is set (this may be an error by itself), but needs to be suppressed to hinder e.g. '1)' @@ -340,7 +339,7 @@ namespace aFontAttribute, rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale(), aBFontColor, - aBTextFillColor, + aTextFillColor, // attributes for TextDecoratedPortionPrimitive2D aBOverlineColor, @@ -370,7 +369,7 @@ namespace aBFontColor, rInfo.mbFilled, rInfo.mnWidthToFill, - aBTextFillColor); + aTextFillColor); } if(rInfo.mbEndOfBullet) |