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>

6 files changed, 92 insertions, 132 deletions

diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 18d1a1d58f61..6aefa298466e 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -338,7 +338,6 @@
 #include <docmodel/color/Transformation.hxx>
 #include <docmodel/dllapi.h>
 #include <docmodel/theme/FormatScheme.hxx>
-#include <docmodel/theme/ThemeColor.hxx>
 #include <docmodel/theme/ThemeColorType.hxx>
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index fdf0e16b69e0..2413d3a2b6f5 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -362,7 +362,6 @@
 #include <docmodel/color/ComplexColor.hxx>
 #include <docmodel/color/Transformation.hxx>
 #include <docmodel/dllapi.h>
-#include <docmodel/theme/ThemeColor.hxx>
 #include <docmodel/theme/ThemeColorType.hxx>
 #include <drawinglayer/attribute/fillgradientattribute.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
diff --git a/sw/qa/core/theme/ThemeTest.cxx b/sw/qa/core/theme/ThemeTest.cxx
index 5d8480035f77..de6132237a4b 100644
--- a/sw/qa/core/theme/ThemeTest.cxx
+++ b/sw/qa/core/theme/ThemeTest.cxx
@@ -43,7 +43,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testThemeColorInHeading)
     auto xComplexColor
         = getProperty<uno::Reference<util::XComplexColor>>(getParagraph(1), "CharComplexColor");
     auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
-    CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent1, aComplexColor.getSchemeType());
+    CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent1, aComplexColor.getThemeColorType());
 }
 
 CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testThemeColorInHeadingODT)
@@ -55,7 +55,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testThemeColorInHeadingODT)
     auto xComplexColor
         = getProperty<uno::Reference<util::XComplexColor>>(getParagraph(1), "CharComplexColor");
     auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
-    CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent1, aComplexColor.getSchemeType());
+    CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent1, aComplexColor.getThemeColorType());
 }
 
 void checkFillStyles(std::vector<model::FillStyle> const& rStyleList)
@@ -67,8 +67,8 @@ void checkFillStyles(std::vector<model::FillStyle> const& rStyleList)
         CPPUNIT_ASSERT(rFillStyle.mpFill);
         CPPUNIT_ASSERT_EQUAL(model::FillType::Solid, rFillStyle.mpFill->meType);
         auto* pSolidFill = static_cast<model::SolidFill*>(rFillStyle.mpFill.get());
-        CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, pSolidFill->maColor.meType);
-        CPPUNIT_ASSERT_EQUAL(size_t(0), pSolidFill->maColor.maTransformations.size());
+        CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, pSolidFill->maColor.getType());
+        CPPUNIT_ASSERT_EQUAL(size_t(0), pSolidFill->maColor.getTransformations().size());
     }
 
     // Fill style 2
@@ -88,21 +88,21 @@ void checkFillStyles(std::vector<model::FillStyle> const& rStyleList)
         {
             auto const& rGradientStop = pGradientFill->maGradientStops[0];
             CPPUNIT_ASSERT_EQUAL(0.0, rGradientStop.mfPosition);
-            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.meType);
-            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.maTransformations.size());
+            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.getType());
+            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.getTransformations().size());
 
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[0];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[0];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(11000), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[1];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[1];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::SatMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(10500), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[2];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[2];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(6700), rTrasnsformation.mnValue);
             }
@@ -110,21 +110,21 @@ void checkFillStyles(std::vector<model::FillStyle> const& rStyleList)
         {
             auto const& rGradientStop = pGradientFill->maGradientStops[1];
             CPPUNIT_ASSERT_EQUAL(0.5, rGradientStop.mfPosition);
-            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.meType);
-            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.maTransformations.size());
+            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.getType());
+            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.getTransformations().size());
 
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[0];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[0];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(10500), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[1];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[1];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::SatMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(10300), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[2];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[2];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(7300), rTrasnsformation.mnValue);
             }
@@ -132,21 +132,21 @@ void checkFillStyles(std::vector<model::FillStyle> const& rStyleList)
         {
             auto const& rGradientStop = pGradientFill->maGradientStops[2];
             CPPUNIT_ASSERT_EQUAL(1.0, rGradientStop.mfPosition);
-            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.meType);
-            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.maTransformations.size());
+            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.getType());
+            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.getTransformations().size());
 
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[0];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[0];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(10500), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[1];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[1];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::SatMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(10900), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[2];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[2];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(8100), rTrasnsformation.mnValue);
             }
@@ -170,20 +170,20 @@ void checkFillStyles(std::vector<model::FillStyle> const& rStyleList)
         {
             auto const& rGradientStop = pGradientFill->maGradientStops[0];
             CPPUNIT_ASSERT_EQUAL(0.0, rGradientStop.mfPosition);
-            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.meType);
-            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.maTransformations.size());
+            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.getType());
+            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.getTransformations().size());
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[0];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[0];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::SatMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(10300), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[1];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[1];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(10200), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[2];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[2];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(9400), rTrasnsformation.mnValue);
             }
@@ -191,20 +191,20 @@ void checkFillStyles(std::vector<model::FillStyle> const& rStyleList)
         {
             auto const& rGradientStop = pGradientFill->maGradientStops[1];
             CPPUNIT_ASSERT_EQUAL(0.5, rGradientStop.mfPosition);
-            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.meType);
-            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.maTransformations.size());
+            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.getType());
+            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.getTransformations().size());
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[0];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[0];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::SatMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(11000), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[1];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[1];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(10000), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[2];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[2];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::Shade, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(10000), rTrasnsformation.mnValue);
             }
@@ -212,20 +212,20 @@ void checkFillStyles(std::vector<model::FillStyle> const& rStyleList)
         {
             auto const& rGradientStop = pGradientFill->maGradientStops[2];
             CPPUNIT_ASSERT_EQUAL(1.0, rGradientStop.mfPosition);
-            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.meType);
-            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.maTransformations.size());
+            CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, rGradientStop.maColor.getType());
+            CPPUNIT_ASSERT_EQUAL(size_t(3), rGradientStop.maColor.getTransformations().size());
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[0];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[0];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(9900), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[1];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[1];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::SatMod, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(12000), rTrasnsformation.mnValue);
             }
             {
-                auto const& rTrasnsformation = rGradientStop.maColor.maTransformations[2];
+                auto const& rTrasnsformation = rGradientStop.maColor.getTransformations()[2];
                 CPPUNIT_ASSERT_EQUAL(model::TransformationType::Shade, rTrasnsformation.meType);
                 CPPUNIT_ASSERT_EQUAL(sal_Int16(7800), rTrasnsformation.mnValue);
             }
@@ -251,8 +251,8 @@ void checkLineStyles(std::vector<model::LineStyle> const& rStyleList)
         CPPUNIT_ASSERT(rFillStyle.mpFill);
         CPPUNIT_ASSERT_EQUAL(model::FillType::Solid, rFillStyle.mpFill->meType);
         auto* pSolidFill = static_cast<model::SolidFill*>(rFillStyle.mpFill.get());
-        CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, pSolidFill->maColor.meType);
-        CPPUNIT_ASSERT_EQUAL(size_t(0), pSolidFill->maColor.maTransformations.size());
+        CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, pSolidFill->maColor.getType());
+        CPPUNIT_ASSERT_EQUAL(size_t(0), pSolidFill->maColor.getTransformations().size());
     }
 
     // Line style 2
@@ -270,8 +270,8 @@ void checkLineStyles(std::vector<model::LineStyle> const& rStyleList)
         CPPUNIT_ASSERT(rFillStyle.mpFill);
         CPPUNIT_ASSERT_EQUAL(model::FillType::Solid, rFillStyle.mpFill->meType);
         auto* pSolidFill = static_cast<model::SolidFill*>(rFillStyle.mpFill.get());
-        CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, pSolidFill->maColor.meType);
-        CPPUNIT_ASSERT_EQUAL(size_t(0), pSolidFill->maColor.maTransformations.size());
+        CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, pSolidFill->maColor.getType());
+        CPPUNIT_ASSERT_EQUAL(size_t(0), pSolidFill->maColor.getTransformations().size());
     }
 
     // Line style 3
@@ -289,8 +289,8 @@ void checkLineStyles(std::vector<model::LineStyle> const& rStyleList)
         CPPUNIT_ASSERT(rFillStyle.mpFill);
         CPPUNIT_ASSERT_EQUAL(model::FillType::Solid, rFillStyle.mpFill->meType);
         auto* pSolidFill = static_cast<model::SolidFill*>(rFillStyle.mpFill.get());
-        CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, pSolidFill->maColor.meType);
-        CPPUNIT_ASSERT_EQUAL(size_t(0), pSolidFill->maColor.maTransformations.size());
+        CPPUNIT_ASSERT_EQUAL(model::ColorType::Placeholder, pSolidFill->maColor.getType());
+        CPPUNIT_ASSERT_EQUAL(size_t(0), pSolidFill->maColor.getTransformations().size());
     }
 }
 
@@ -319,15 +319,13 @@ void checkEffects(std::vector<model::EffectStyle> const& rEffectStyleList)
         CPPUNIT_ASSERT_EQUAL(model::RectangleAlignment::Center, rEffect.meAlignment);
         CPPUNIT_ASSERT_EQUAL(false, rEffect.mbRotateWithShape);
 
-        CPPUNIT_ASSERT_EQUAL(model::ColorType::RGB, rEffect.maColor.meType);
-        CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rEffect.maColor.mnComponent1);
-        CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rEffect.maColor.mnComponent2);
-        CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rEffect.maColor.mnComponent3);
+        CPPUNIT_ASSERT_EQUAL(model::ColorType::RGB, rEffect.maColor.getType());
+        CPPUNIT_ASSERT_EQUAL(Color(0x000000), rEffect.maColor.getRGB());
 
-        CPPUNIT_ASSERT_EQUAL(size_t(1), rEffect.maColor.maTransformations.size());
+        CPPUNIT_ASSERT_EQUAL(size_t(1), rEffect.maColor.getTransformations().size());
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::Alpha,
-                             rEffect.maColor.maTransformations[0].meType);
-        CPPUNIT_ASSERT_EQUAL(sal_Int16(6300), rEffect.maColor.maTransformations[0].mnValue);
+                             rEffect.maColor.getTransformations()[0].meType);
+        CPPUNIT_ASSERT_EQUAL(sal_Int16(6300), rEffect.maColor.getTransformations()[0].mnValue);
     }
 }
 
diff --git a/sw/qa/extras/ooxmlexport/ooxml_ThemeExport.cxx b/sw/qa/extras/ooxmlexport/ooxml_ThemeExport.cxx
index 45bd8014f1d3..a0ffe87d00cf 100644
--- a/sw/qa/extras/ooxmlexport/ooxml_ThemeExport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxml_ThemeExport.cxx
@@ -29,7 +29,7 @@ DECLARE_SW_ROUNDTRIP_TEST(testThemePortionLevelCharColor_ODF,
     auto xComplexColor = getProperty<uno::Reference<util::XComplexColor>>(getRun(xParagraph, 1),
                                                                           "CharComplexColor");
     auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
-    CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent2, aComplexColor.getSchemeType());
+    CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent2, aComplexColor.getThemeColorType());
     auto const& rTransforms = aComplexColor.getTransformations();
     CPPUNIT_ASSERT_EQUAL(size_t(1), rTransforms.size());
     CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTransforms[0].meType);
@@ -44,7 +44,7 @@ DECLARE_SW_ROUNDTRIP_TEST(testThemePortionLevelCharColor_DOCX,
     auto xComplexColor = getProperty<uno::Reference<util::XComplexColor>>(getRun(xParagraph, 1),
                                                                           "CharComplexColor");
     auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
-    CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent2, aComplexColor.getSchemeType());
+    CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent2, aComplexColor.getThemeColorType());
     auto const& rTransforms = aComplexColor.getTransformations();
     CPPUNIT_ASSERT_EQUAL(size_t(1), rTransforms.size());
     CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTransforms[0].meType);
@@ -60,7 +60,7 @@ DECLARE_SW_ROUNDTRIP_TEST(testThemePortionBorderColor_DOCX, "Test_ThemeBorderCol
         auto xComplexColor
             = getProperty<uno::Reference<util::XComplexColor>>(xParagraph, "TopBorderComplexColor");
         auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
-        CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent2, aComplexColor.getSchemeType());
+        CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent2, aComplexColor.getThemeColorType());
         auto const& rTransforms = aComplexColor.getTransformations();
         CPPUNIT_ASSERT_EQUAL(size_t(1), rTransforms.size());
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTransforms[0].meType);
@@ -70,7 +70,7 @@ DECLARE_SW_ROUNDTRIP_TEST(testThemePortionBorderColor_DOCX, "Test_ThemeBorderCol
         auto xComplexColor = getProperty<uno::Reference<util::XComplexColor>>(
             xParagraph, "BottomBorderComplexColor");
         auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
-        CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent4, aComplexColor.getSchemeType());
+        CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent4, aComplexColor.getThemeColorType());
         auto const& rTransforms = aComplexColor.getTransformations();
         CPPUNIT_ASSERT_EQUAL(size_t(1), rTransforms.size());
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTransforms[0].meType);
@@ -90,7 +90,7 @@ DECLARE_SW_ROUNDTRIP_TEST(testCharUnderlineTheme_DOCX, "Test_CharUnderlineThemeC
     auto xComplexColor
         = getProperty<uno::Reference<util::XComplexColor>>(xRun, "CharUnderlineComplexColor");
     auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
-    CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent1, aComplexColor.getSchemeType());
+    CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent1, aComplexColor.getThemeColorType());
     auto const& rTransforms = aComplexColor.getTransformations();
     CPPUNIT_ASSERT_EQUAL(size_t(1), rTransforms.size());
     CPPUNIT_ASSERT_EQUAL(model::TransformationType::Shade, rTransforms[0].meType);
@@ -106,7 +106,7 @@ DECLARE_SW_ROUNDTRIP_TEST(testParaBackgroundTheme_DOCX, "Test_ThemeTextParaBackg
         auto xComplexColor = getProperty<uno::Reference<util::XComplexColor>>(
             xParagraph, "ParaBackgroundComplexColor");
         auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
-        CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent3, aComplexColor.getSchemeType());
+        CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent3, aComplexColor.getThemeColorType());
         auto const& rTransforms = aComplexColor.getTransformations();
         CPPUNIT_ASSERT_EQUAL(size_t(1), rTransforms.size());
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTransforms[0].meType);
@@ -119,7 +119,7 @@ DECLARE_SW_ROUNDTRIP_TEST(testParaBackgroundTheme_DOCX, "Test_ThemeTextParaBackg
         auto xComplexColor = getProperty<uno::Reference<util::XComplexColor>>(
             xParagraph, "ParaBackgroundComplexColor");
         auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
-        CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent6, aComplexColor.getSchemeType());
+        CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent6, aComplexColor.getThemeColorType());
         auto const& rTransforms = aComplexColor.getTransformations();
         CPPUNIT_ASSERT_EQUAL(size_t(1), rTransforms.size());
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTransforms[0].meType);
@@ -132,7 +132,7 @@ DECLARE_SW_ROUNDTRIP_TEST(testParaBackgroundTheme_DOCX, "Test_ThemeTextParaBackg
         auto xComplexColor = getProperty<uno::Reference<util::XComplexColor>>(
             xParagraph, "ParaBackgroundComplexColor");
         auto aComplexColor = model::color::getFromXComplexColor(xComplexColor);
-        CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent3, aComplexColor.getSchemeType());
+        CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent3, aComplexColor.getThemeColorType());
         auto const& rTransforms = aComplexColor.getTransformations();
         CPPUNIT_ASSERT_EQUAL(size_t(1), rTransforms.size());
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::Tint, rTransforms[0].meType);
diff --git a/sw/source/core/model/ThemeColorChanger.cxx b/sw/source/core/model/ThemeColorChanger.cxx
index 03fe47641bf3..14da568e2369 100644
--- a/sw/source/core/model/ThemeColorChanger.cxx
+++ b/sw/source/core/model/ThemeColorChanger.cxx
@@ -49,15 +49,11 @@ bool changeBorderLine(editeng::SvxBorderLine* pBorderLine, model::ColorSet const
         return false;
 
     model::ComplexColor const& rComplexColor = pBorderLine->getComplexColor();
-    if (rComplexColor.meType == model::ColorType::Scheme)
+    if (rComplexColor.isValidThemeType())
     {
-        auto eThemeType = rComplexColor.meSchemeType;
-        if (eThemeType != model::ThemeColorType::Unknown)
-        {
-            Color aColor = rColorSet.resolveColor(rComplexColor);
-            pBorderLine->SetColor(aColor);
-            return true;
-        }
+        Color aColor = rColorSet.resolveColor(rComplexColor);
+        pBorderLine->SetColor(aColor);
+        return true;
     }
     return false;
 }
@@ -99,8 +95,7 @@ public:
                 if (const SvxColorItem* pItem = pStyleHandle->GetItemIfSet(RES_CHRATR_COLOR))
                 {
                     model::ComplexColor const& rComplexColor = pItem->getComplexColor();
-                    auto eSchemeType = rComplexColor.meSchemeType;
-                    if (eSchemeType != model::ThemeColorType::Unknown)
+                    if (rComplexColor.isValidThemeType())
                     {
                         Color aNewColor = mrColorSet.resolveColor(rComplexColor);
                         auto pNew = pItem->Clone();
@@ -114,8 +109,7 @@ public:
                     = pStyleHandle->GetItemIfSet(RES_CHRATR_UNDERLINE))
                 {
                     model::ComplexColor const& rComplexColor = pItem->getComplexColor();
-                    auto eSchemeType = rComplexColor.meSchemeType;
-                    if (eSchemeType != model::ThemeColorType::Unknown)
+                    if (rComplexColor.isValidThemeType())
                     {
                         Color aNewColor = mrColorSet.resolveColor(rComplexColor);
                         auto pNew = pItem->Clone();
@@ -128,8 +122,7 @@ public:
                 if (const SvxOverlineItem* pItem = pStyleHandle->GetItemIfSet(RES_CHRATR_OVERLINE))
                 {
                     model::ComplexColor const& rComplexColor = pItem->getComplexColor();
-                    auto eSchemeType = rComplexColor.meSchemeType;
-                    if (eSchemeType != model::ThemeColorType::Unknown)
+                    if (rComplexColor.isValidThemeType())
                     {
                         Color aNewColor = mrColorSet.resolveColor(rComplexColor);
                         auto pNew = pItem->Clone();
@@ -153,64 +146,48 @@ public:
         if (const SvxColorItem* pItem = aAttrSet.GetItemIfSet(RES_CHRATR_COLOR, false))
         {
             model::ComplexColor const& rComplexColor = pItem->getComplexColor();
-            if (rComplexColor.meType == model::ColorType::Scheme)
+            if (rComplexColor.isValidThemeType())
             {
-                auto eSchemeType = rComplexColor.meSchemeType;
-                if (eSchemeType != model::ThemeColorType::Unknown)
-                {
-                    Color aNewColor = mrColorSet.resolveColor(rComplexColor);
-                    std::unique_ptr<SvxColorItem> pNewItem(pItem->Clone());
-                    pNewItem->setColor(aNewColor);
-                    pTextNode->SetAttr(*pNewItem);
-                }
+                Color aNewColor = mrColorSet.resolveColor(rComplexColor);
+                std::unique_ptr<SvxColorItem> pNewItem(pItem->Clone());
+                pNewItem->setColor(aNewColor);
+                pTextNode->SetAttr(*pNewItem);
             }
         }
 
         if (const SvxUnderlineItem* pItem = aAttrSet.GetItemIfSet(RES_CHRATR_UNDERLINE, false))
         {
             model::ComplexColor const& rComplexColor = pItem->getComplexColor();
-            if (rComplexColor.meType == model::ColorType::Scheme)
+            if (rComplexColor.isValidThemeType())
             {
-                auto eSchemeType = rComplexColor.meSchemeType;
-                if (eSchemeType != model::ThemeColorType::Unknown)
-                {
-                    Color aNewColor = mrColorSet.resolveColor(rComplexColor);
-                    std::unique_ptr<SvxUnderlineItem> pNewItem(pItem->Clone());
-                    pNewItem->SetColor(aNewColor);
-                    pTextNode->SetAttr(*pNewItem);
-                }
+                Color aNewColor = mrColorSet.resolveColor(rComplexColor);
+                std::unique_ptr<SvxUnderlineItem> pNewItem(pItem->Clone());
+                pNewItem->SetColor(aNewColor);
+                pTextNode->SetAttr(*pNewItem);
             }
         }
 
         if (const SvxOverlineItem* pItem = aAttrSet.GetItemIfSet(RES_CHRATR_OVERLINE, false))
         {
             model::ComplexColor const& rComplexColor = pItem->getComplexColor();
-            if (rComplexColor.meType == model::ColorType::Scheme)
+            if (rComplexColor.isValidThemeType())
             {
-                auto eSchemeType = rComplexColor.meSchemeType;
-                if (eSchemeType != model::ThemeColorType::Unknown)
-                {
-                    Color aNewColor = mrColorSet.resolveColor(rComplexColor);
-                    std::unique_ptr<SvxOverlineItem> pNewItem(pItem->Clone());
-                    pNewItem->SetColor(aNewColor);
-                    pTextNode->SetAttr(*pNewItem);
-                }
+                Color aNewColor = mrColorSet.resolveColor(rComplexColor);
+                std::unique_ptr<SvxOverlineItem> pNewItem(pItem->Clone());
+                pNewItem->SetColor(aNewColor);
+                pTextNode->SetAttr(*pNewItem);
             }
         }
 
         if (const XFillColorItem* pItem = aAttrSet.GetItemIfSet(XATTR_FILLCOLOR, false))
         {
             model::ComplexColor const& rComplexColor = pItem->getComplexColor();
-            if (rComplexColor.meType == model::ColorType::Scheme)
+            if (rComplexColor.isValidThemeType())
             {
-                auto eSchemeType = rComplexColor.meSchemeType;
-                if (eSchemeType != model::ThemeColorType::Unknown)
-                {
-                    Color aNewColor = mrColorSet.resolveColor(rComplexColor);
-                    std::unique_ptr<XFillColorItem> pNewItem(pItem->Clone());
-                    pNewItem->SetColorValue(aNewColor);
-                    pTextNode->SetAttr(*pNewItem);
-                }
+                Color aNewColor = mrColorSet.resolveColor(rComplexColor);
+                std::unique_ptr<XFillColorItem> pNewItem(pItem->Clone());
+                pNewItem->SetColorValue(aNewColor);
+                pTextNode->SetAttr(*pNewItem);
             }
         }
 
@@ -264,10 +241,7 @@ bool changeOverlineColor(SwAttrSet const& rSet, SfxItemSet& rNewSet,
 {
     SvxOverlineItem aItem(rSet.Get(RES_CHRATR_OVERLINE, false));
     model::ComplexColor const& rComplexColor = aItem.getComplexColor();
-    if (rComplexColor.meType != model::ColorType::Scheme)
-        return false;
-    auto eThemeType = rComplexColor.meSchemeType;
-    if (eThemeType == model::ThemeColorType::Unknown)
+    if (!rComplexColor.isValidThemeType())
         return false;
     Color aColor = rColorSet.resolveColor(rComplexColor);
     aItem.SetColor(aColor);
@@ -280,10 +254,7 @@ bool changeUnderlineColor(SwAttrSet const& rSet, SfxItemSet& rNewSet,
 {
     SvxUnderlineItem aItem(rSet.Get(RES_CHRATR_UNDERLINE, false));
     model::ComplexColor const& rComplexColor = aItem.getComplexColor();
-    if (rComplexColor.meType != model::ColorType::Scheme)
-        return false;
-    auto eThemeType = rComplexColor.meSchemeType;
-    if (eThemeType == model::ThemeColorType::Unknown)
+    if (!rComplexColor.isValidThemeType())
         return false;
     Color aColor = rColorSet.resolveColor(rComplexColor);
     aItem.SetColor(aColor);
@@ -295,10 +266,7 @@ bool changeColor(SwAttrSet const& rSet, SfxItemSet& rNewSet, model::ColorSet con
 {
     SvxColorItem aColorItem(rSet.GetColor(false));
     model::ComplexColor const& rComplexColor = aColorItem.getComplexColor();
-    if (rComplexColor.meType != model::ColorType::Scheme)
-        return false;
-    auto eThemeType = rComplexColor.meSchemeType;
-    if (eThemeType == model::ThemeColorType::Unknown)
+    if (!rComplexColor.isValidThemeType())
         return false;
     Color aColor = rColorSet.resolveColor(rComplexColor);
     aColorItem.SetValue(aColor);
@@ -310,10 +278,7 @@ bool changeBackground(SwAttrSet const& rSet, SfxItemSet& rNewSet, model::ColorSe
 {
     XFillColorItem aFillItem(rSet.Get(XATTR_FILLCOLOR, false));
     model::ComplexColor const& rComplexColor = aFillItem.getComplexColor();
-    if (rComplexColor.meType != model::ColorType::Scheme)
-        return false;
-    auto eThemeType = rComplexColor.getSchemeType();
-    if (eThemeType == model::ThemeColorType::Unknown)
+    if (!rComplexColor.isValidThemeType())
         return false;
     Color aColor = rColorSet.resolveColor(rComplexColor);
     aFillItem.SetColorValue(aColor);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index ec55455d5d3c..d6c9c14544b1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -312,22 +312,21 @@ void lclAddThemeValuesToCustomAttributes(
         { model::ThemeColorType::FollowedHyperlink, "followedHyperlink" }
     });
 
-    if (rComplexColor.getType() == model::ColorType::Scheme &&
-        rComplexColor.getSchemeType() != model::ThemeColorType::Unknown)
+    if (rComplexColor.isValidThemeType())
     {
-        OString sSchemeType = constThemeColorTypeTokenMap.find(rComplexColor.getSchemeType())->second;
-        if (rComplexColor.meThemeColorUsage == model::ThemeColorUsage::Text)
+        OString sSchemeType = constThemeColorTypeTokenMap.find(rComplexColor.getThemeColorType())->second;
+        if (rComplexColor.getThemeColorUsage() == model::ThemeColorUsage::Text)
         {
-            if (rComplexColor.getSchemeType() == model::ThemeColorType::Dark1)
+            if (rComplexColor.getThemeColorType() == model::ThemeColorType::Dark1)
                 sSchemeType = "text1";
-            else if (rComplexColor.getSchemeType() == model::ThemeColorType::Dark2)
+            else if (rComplexColor.getThemeColorType() == model::ThemeColorType::Dark2)
                 sSchemeType = "text2";
         }
-        else if (rComplexColor.meThemeColorUsage == model::ThemeColorUsage::Background)
+        else if (rComplexColor.getThemeColorUsage() == model::ThemeColorUsage::Background)
         {
-            if (rComplexColor.getSchemeType() == model::ThemeColorType::Light1)
+            if (rComplexColor.getThemeColorType() == model::ThemeColorType::Light1)
                 sSchemeType = "background1";
-            else if (rComplexColor.getSchemeType() == model::ThemeColorType::Light2)
+            else if (rComplexColor.getThemeColorType() == model::ThemeColorType::Light2)
                 sSchemeType = "background2";
         }