From 7501f8928264c48c88ab6ee6b757b295b13b63d4 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Fri, 19 May 2023 23:01:58 +0900 Subject: sc: use ComplexColor for font color (+others) in OOXML export MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2544c7ece152323d84faafe1a544e4f89ca466d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152014 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- include/docmodel/color/ComplexColor.hxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/docmodel/color/ComplexColor.hxx b/include/docmodel/color/ComplexColor.hxx index 19e228b2a858..4952d91ac217 100644 --- a/include/docmodel/color/ComplexColor.hxx +++ b/include/docmodel/color/ComplexColor.hxx @@ -133,13 +133,19 @@ public: meType = ColorType::CRGB; } + void setColor(Color const& rColor) + { + mnComponent1 = rColor.GetRed(); + mnComponent2 = rColor.GetGreen(); + mnComponent3 = rColor.GetBlue(); + maFinalColor = rColor; + meType = ColorType::RGB; + } + void setRGB(sal_Int32 nRGB) { ::Color aColor(ColorTransparency, nRGB); - mnComponent1 = aColor.GetRed(); - mnComponent2 = aColor.GetGreen(); - mnComponent3 = aColor.GetBlue(); - meType = ColorType::RGB; + setColor(aColor); } void setHSL(sal_Int32 nH, sal_Int32 nS, sal_Int32 nL) -- cgit