diff options
author | matteocam <matteo.campanelli@gmail.com> | 2014-06-17 16:17:47 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:43 +0200 |
commit | 2727a6dbf46fad3301ab0f24dce7da50976212f4 (patch) | |
tree | e7ee886ad6de71ac90c915cbeb25a6a811ff3aa2 /include | |
parent | 64de49e9b26b7a65e63c24e930ef7e42372d26ba (diff) |
Changed BColor to Color in TextFooPrimitive2D classes
Change-Id: I4f29ec307f7f86e0a43d661785f90601e24a16ce
(cherry picked from commit 530db75780c0c7711e1e334e6968cd357bf3d5a0)
Diffstat (limited to 'include')
-rw-r--r-- | include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx | 2 | ||||
-rw-r--r-- | include/drawinglayer/primitive2d/textprimitive2d.hxx | 14 |
2 files changed, 12 insertions, 4 deletions
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; } |