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, 7 insertions, 7 deletions

diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 21bf0f66a340..ed14194c2a01 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -222,7 +222,7 @@ model::ComplexColor BorderHandler::getComplexColor() const
     if (m_eThemeColorType == model::ThemeColorType::Unknown)
         return aComplexColor;
 
-    aComplexColor.setSchemeColor(m_eThemeColorType);
+    aComplexColor.setThemeColor(m_eThemeColorType);
 
     if (m_nThemeTint > 0 )
     {
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index ef4eb5dc4172..b99d40c08a12 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -353,7 +353,7 @@ model::ComplexColor CellColorHandler::getComplexColor() const
     model::ComplexColor aComplexColor;
     if (m_eThemeColorType != model::ThemeColorType::Unknown)
     {
-        aComplexColor.setSchemeColor(m_eThemeColorType);
+        aComplexColor.setThemeColor(m_eThemeColorType);
 
         if (m_nThemeColorTint > 0 )
         {
@@ -374,7 +374,7 @@ model::ComplexColor CellColorHandler::getFillComplexColor() const
     model::ComplexColor aComplexColor;
     if (m_eFillThemeColorType != model::ThemeColorType::Unknown)
     {
-        aComplexColor.setSchemeColor(m_eFillThemeColorType);
+        aComplexColor.setThemeColor(m_eFillThemeColorType);
 
         if (m_nFillThemeColorTint > 0 )
         {
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index b1d3b71009c6..7c830115fb9f 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -372,7 +372,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
                 if (nName == NS_ooxml::LN_CT_Underline_themeColor)
                 {
                     auto eThemeColorType = TDefTableHandler::getThemeColorTypeIndex(nIntValue);
-                    aComplexColor.setSchemeColor(eThemeColorType);
+                    aComplexColor.setThemeColor(eThemeColorType);
                 }
                 else if (nName == NS_ooxml::LN_CT_Underline_themeTint)
                 {
@@ -2300,10 +2300,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
                 {
 
                     model::ComplexColor aComplexColor;
-                    aComplexColor.setSchemeColor(eType);
+                    aComplexColor.setThemeColor(eType);
 
                     auto eUsage = TDefTableHandler::getThemeColorUsage(pThemeColorHandler->mnIndex);
-                    aComplexColor.meThemeColorUsage = eUsage;
+                    aComplexColor.setThemeColorUsage(eUsage);
 
                     if (pThemeColorHandler->mnTint > 0 )
                     {
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 288a08f26502..9626beb595bc 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -491,7 +491,7 @@ void TDefTableHandler::fillCellProperties( const ::tools::SvRef< TablePropertyMa
     if (m_eThemeColorType != model::ThemeColorType::Unknown)
     {
         model::ComplexColor aComplexColor;
-        aComplexColor.setSchemeColor(m_eThemeColorType);
+        aComplexColor.setThemeColor(m_eThemeColorType);
 
         if (m_nThemeTint > 0 )
         {