ComplexColor various clean-up and (trivial) refactorings

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 <quikee@gmail.com>

4 files changed, 6 insertions, 8 deletions

diff --git a/docmodel/Library_docmodel.mk b/docmodel/Library_docmodel.mk
index 2e474eb4f0b8..722e723daa55 100644
--- a/docmodel/Library_docmodel.mk
+++ b/docmodel/Library_docmodel.mk
@@ -36,12 +36,10 @@ $(eval $(call gb_Library_set_precompiled_header,docmodel,docmodel/inc/pch/precom
 $(eval $(call gb_Library_use_sdk_api,docmodel))
 
 $(eval $(call gb_Library_use_libraries,docmodel,\
-    basegfx \
     comphelper \
     cppuhelper \
     cppu \
     sal \
-    vcl \
     tl \
 ))
 
diff --git a/docmodel/source/color/ComplexColorJSON.cxx b/docmodel/source/color/ComplexColorJSON.cxx
index f6b52d1bf55c..9be3ec0c0303 100644
--- a/docmodel/source/color/ComplexColorJSON.cxx
+++ b/docmodel/source/color/ComplexColorJSON.cxx
@@ -26,7 +26,7 @@ bool convertFromJSON(OString const& rJsonString, model::ComplexColor& rComplexCo
         boost::property_tree::read_json(aStream, aRootTree);
 
         sal_Int32 nThemeType = aRootTree.get<sal_Int32>("ThemeIndex", -1);
-        aComplexColor.setSchemeColor(model::convertToThemeColorType(nThemeType));
+        aComplexColor.setThemeColor(model::convertToThemeColorType(nThemeType));
         boost::property_tree::ptree aTransformTree = aRootTree.get_child("Transformations");
         for (const auto& rEachTransformationNode :
              boost::make_iterator_range(aTransformTree.equal_range("")))
@@ -60,7 +60,7 @@ bool convertFromJSON(OString const& rJsonString, model::ComplexColor& rComplexCo
 
 void convertToJSONTree(boost::property_tree::ptree& rTree, model::ComplexColor const& rComplexColor)
 {
-    rTree.put("ThemeIndex", sal_Int16(rComplexColor.getSchemeType()));
+    rTree.put("ThemeIndex", sal_Int16(rComplexColor.getThemeColorType()));
 
     boost::property_tree::ptree aTransformationsList;
     for (auto const& rTransformation : rComplexColor.getTransformations())
diff --git a/docmodel/source/theme/ColorSet.cxx b/docmodel/source/theme/ColorSet.cxx
index 71b928b9f2a7..df7cf18f61b6 100644
--- a/docmodel/source/theme/ColorSet.cxx
+++ b/docmodel/source/theme/ColorSet.cxx
@@ -40,13 +40,13 @@ Color ColorSet::getColor(model::ThemeColorType eType) const
 
 Color ColorSet::resolveColor(model::ComplexColor const& rComplexColor) const
 {
-    auto eSchemeType = rComplexColor.meSchemeType;
-    if (eSchemeType == model::ThemeColorType::Unknown)
+    auto eThemeType = rComplexColor.getThemeColorType();
+    if (eThemeType == model::ThemeColorType::Unknown)
     {
         SAL_WARN("svx", "ColorSet::resolveColor with ThemeColorType::Unknown");
         return COL_AUTO;
     }
-    Color aColor = getColor(eSchemeType);
+    Color aColor = getColor(eThemeType);
     return rComplexColor.applyTransformations(aColor);
 }
 
diff --git a/docmodel/source/uno/UnoComplexColor.cxx b/docmodel/source/uno/UnoComplexColor.cxx
index 673627bc98a4..f419543ca0a9 100644
--- a/docmodel/source/uno/UnoComplexColor.cxx
+++ b/docmodel/source/uno/UnoComplexColor.cxx
@@ -15,7 +15,7 @@ using namespace css;
 
 sal_Int32 UnoComplexColor::getType() { return sal_Int32(maColor.getType()); }
 
-sal_Int32 UnoComplexColor::getSchemeColorType() { return sal_Int32(maColor.getSchemeType()); }
+sal_Int32 UnoComplexColor::getThemeColorType() { return sal_Int32(maColor.getThemeColorType()); }
 
 util::Color UnoComplexColor::resolveColor(uno::Reference<util::XTheme> const& /*xTheme*/)
 {