From 9d5a7d9257db78eb3f4d77c39eae1affe877ea6b Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Thu, 3 Aug 2023 10:14:40 +0200 Subject: ComplexColor various clean-up and (trivial) refactorings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't allow access to member variables of ComplexColor and makes them private. Needs a lot of changes. Change "scheme" to "theme" to be more consistent. In LO we usually call the "theme color" what is usually refered to as "scheme color" in OOXML, where it is sometimes refered to as "scheme" and other times as theme color. Remove ThemeColor class which was replaced with CmplexColor some time ago. Remove un-needed includes and un-needed components. Use isValidThemeColor in many places where we check that the ComplexColor is of "Theme" type and that ThemeColorType is set to a valid value. Change-Id: I325595fa65b8e56a4707e9d22acc6330aac28961 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155359 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- oox/source/drawingml/fillproperties.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'oox/source/drawingml/fillproperties.cxx') diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 5edc71b8bc12..a11aeb6236ee 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -430,7 +430,7 @@ void FillProperties::pushToPropMap(ShapePropertyMap& rPropMap, const GraphicHelp model::ComplexColor aComplexColor; if (aFillColor == nPhClr) { - aComplexColor.setSchemeColor(model::convertToThemeColorType(nPhClrTheme)); + aComplexColor.setThemeColor(model::convertToThemeColorType(nPhClrTheme)); } else { -- cgit