From 2727a6dbf46fad3301ab0f24dce7da50976212f4 Mon Sep 17 00:00:00 2001 From: matteocam Date: Tue, 17 Jun 2014 16:17:47 +0200 Subject: Changed BColor to Color in TextFooPrimitive2D classes Change-Id: I4f29ec307f7f86e0a43d661785f90601e24a16ce (cherry picked from commit 530db75780c0c7711e1e334e6968cd357bf3d5a0) --- drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 4 ++-- drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/textprimitive2d.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'drawinglayer') 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), -- cgit v1.2.3