6 files changed, 15 insertions, 15 deletions
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 8a3fd112902d..d19aabd2d5ad 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -302,6 +302,7 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
     xmloff/source/text/XMLChangeImportContext \
     xmloff/source/text/XMLChangeInfoContext \
     xmloff/source/text/XMLChangedRegionImportContext \
+    xmloff/source/text/XMLComplexColorContext \
     xmloff/source/text/XMLFootnoteBodyImportContext \
     xmloff/source/text/XMLFootnoteConfigurationImportContext \
     xmloff/source/text/XMLFootnoteImportContext \
@@ -340,7 +341,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
     xmloff/source/text/XMLTextCharStyleNamesElementExport \
     xmloff/source/text/XMLTextColumnsContext \
     xmloff/source/text/XMLTextColumnsExport \
-    xmloff/source/text/XMLThemeColorContext \
     xmloff/source/text/XMLThemeColorExport \
     xmloff/source/text/XMLTextFrameContext \
     xmloff/source/text/XMLTextFrameHyperlinkContext \
diff --git a/xmloff/inc/XMLThemeColorContext.hxx b/xmloff/inc/XMLComplexColorContext.hxx
index 8bab725c44a6..2d43da23fedd 100644
--- a/xmloff/inc/XMLThemeColorContext.hxx
+++ b/xmloff/inc/XMLComplexColorContext.hxx
@@ -13,15 +13,15 @@
 #include "XMLElementPropertyContext.hxx"
 #include <docmodel/uno/UnoComplexColor.hxx>
 
-class XMLThemeColorContext final : public XMLElementPropertyContext
+class XMLComplexColorContext final : public XMLElementPropertyContext
 {
     model::ComplexColor maComplexColor;
     sal_Int32 mnRootElement;
 
 public:
-    XMLThemeColorContext(SvXMLImport& rImport, sal_Int32 nElement,
-                         const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
-                         const XMLPropertyState& rProp, std::vector<XMLPropertyState>& rProps);
+    XMLComplexColorContext(SvXMLImport& rImport, sal_Int32 nElement,
+                           const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
+                           const XMLPropertyState& rProp, std::vector<XMLPropertyState>& rProps);
 
     css::uno::Reference<css::xml::sax::XFastContextHandler> SAL_CALL createFastChildContext(
         sal_Int32 nElement,
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index 9db7cac43464..067e1e7d13a4 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -19,7 +19,7 @@
 
 #include <XMLShapePropertySetContext.hxx>
 #include <XMLTextColumnsContext.hxx>
-#include <XMLThemeColorContext.hxx>
+#include <XMLComplexColorContext.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmltabi.hxx>
@@ -84,7 +84,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLShapePropertySetCon
         return new XMLTextColumnsContext(GetImport(), nElement, xAttrList, rProp, rProperties);
 
     case CTF_COMPLEX_COLOR:
-        return new XMLThemeColorContext(GetImport(), nElement, xAttrList, rProp, rProperties);
+        return new XMLComplexColorContext(GetImport(), nElement, xAttrList, rProp, rProperties);
     }
 
     return SvXMLPropertySetContext::createFastChildContext( nElement,
diff --git a/xmloff/source/text/XMLThemeColorContext.cxx b/xmloff/source/text/XMLComplexColorContext.cxx
index aeea540bbdf3..f506a71941d9 100644
--- a/xmloff/source/text/XMLThemeColorContext.cxx
+++ b/xmloff/source/text/XMLComplexColorContext.cxx
@@ -18,7 +18,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmlprhdl.hxx>
-#include <XMLThemeColorContext.hxx>
+#include <XMLComplexColorContext.hxx>
 
 using namespace css;
 using namespace xmloff::token;
@@ -29,7 +29,7 @@ SvXMLEnumMapEntry<sal_Int16> const pXML_ThemeColor_Enum[]
         { XML_ACCENT4, 7 },   { XML_ACCENT5, 8 },      { XML_ACCENT6, 9 }, { XML_HLINK, 10 },
         { XML_FOLHLINK, 11 }, { XML_TOKEN_INVALID, 0 } };
 
-XMLThemeColorContext::XMLThemeColorContext(
+XMLComplexColorContext::XMLComplexColorContext(
     SvXMLImport& rImport, sal_Int32 nElement,
     const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, const XMLPropertyState& rProp,
     std::vector<XMLPropertyState>& rProps)
@@ -57,7 +57,7 @@ XMLThemeColorContext::XMLThemeColorContext(
 }
 
 css::uno::Reference<css::xml::sax::XFastContextHandler>
-XMLThemeColorContext::createFastChildContext(
+XMLComplexColorContext::createFastChildContext(
     sal_Int32 nElement, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList)
 {
     if (nElement == XML_ELEMENT(LO_EXT, XML_TRANSFORMATION))
@@ -100,7 +100,7 @@ XMLThemeColorContext::createFastChildContext(
     return nullptr;
 }
 
-void XMLThemeColorContext::endFastElement(sal_Int32 nElement)
+void XMLComplexColorContext::endFastElement(sal_Int32 nElement)
 {
     if (nElement == mnRootElement)
     {
diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx
index 2f8398b76cf2..983a4a82773b 100644
--- a/xmloff/source/text/XMLTextPropertySetContext.cxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.cxx
@@ -20,7 +20,7 @@
 #include <tools/debug.hxx>
 #include "XMLTextPropertySetContext.hxx"
 #include <XMLTextColumnsContext.hxx>
-#include <XMLThemeColorContext.hxx>
+#include <XMLComplexColorContext.hxx>
 #include <XMLBackgroundImageContext.hxx>
 #include "XMLSectionFootnoteConfigImport.hxx"
 
@@ -70,7 +70,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTextPropertySetCont
         break;
 
     case CTF_COMPLEX_COLOR:
-        return new XMLThemeColorContext(GetImport(), nElement, xAttrList, rProp, rProperties);
+        return new XMLComplexColorContext(GetImport(), nElement, xAttrList, rProp, rProperties);
         break;
 
     case CTF_DROPCAPFORMAT:
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index b0ece39a2d82..2928ff905638 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -27,7 +27,7 @@
 #include <xmloff/XMLEventsImportContext.hxx>
 #include <XMLShapePropertySetContext.hxx>
 #include <XMLTextColumnsContext.hxx>
-#include <XMLThemeColorContext.hxx>
+#include <XMLComplexColorContext.hxx>
 #include <XMLBackgroundImageContext.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/xmltypes.hxx>
@@ -91,7 +91,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTextShapePropertySe
         break;
 
     case CTF_COMPLEX_COLOR:
-        return new XMLThemeColorContext(GetImport(), nElement, xAttrList, rProp, rProperties);
+        return new XMLComplexColorContext(GetImport(), nElement, xAttrList, rProp, rProperties);
 
     case CTF_BACKGROUND_URL:
         DBG_ASSERT( rProp.mnIndex >= 3 &&