19 files changed, 15 insertions, 173 deletions
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index ab81cc3cb461..c19032de2d70 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <com/sun/star/style/GraphicLocation.hpp>
-#include "XMLElementPropertyContext.hxx"
+#include <xmloff/XMLElementPropertyContext.hxx>
 
 namespace com::sun::star {
     namespace io { class XOutputStream; }
diff --git a/xmloff/inc/XMLComplexColorContext.hxx b/xmloff/inc/XMLComplexColorContext.hxx
deleted file mode 100644
index 2d43da23fedd..000000000000
--- a/xmloff/inc/XMLComplexColorContext.hxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#pragma once
-
-#include <memory>
-#include "XMLElementPropertyContext.hxx"
-#include <docmodel/uno/UnoComplexColor.hxx>
-
-class XMLComplexColorContext final : public XMLElementPropertyContext
-{
-    model::ComplexColor maComplexColor;
-    sal_Int32 mnRootElement;
-
-public:
-    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,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList>& AttrList) override;
-
-    void SAL_CALL endFastElement(sal_Int32 nElement) override;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLComplexColorExport.hxx b/xmloff/inc/XMLComplexColorExport.hxx
deleted file mode 100644
index d62e10fd5c1b..000000000000
--- a/xmloff/inc/XMLComplexColorExport.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-#pragma once
-
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-
-namespace com::sun::star::uno
-{
-class Any;
-}
-class SvXMLExport;
-
-class XMLComplexColorExport
-{
-    SvXMLExport& mrExport;
-
-public:
-    XMLComplexColorExport(SvXMLExport& rExport);
-
-    void exportXML(const css::uno::Any& rAny, sal_uInt16 nPrefix, const OUString& rLocalName);
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLComplexColorHandler.hxx b/xmloff/inc/XMLComplexColorHandler.hxx
deleted file mode 100644
index 052b0db6c1d4..000000000000
--- a/xmloff/inc/XMLComplexColorHandler.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#pragma once
-
-#include <docmodel/uno/UnoComplexColor.hxx>
-
-using namespace ::xmloff::token;
-using namespace css;
-
-class XMLComplexColorHandler : public XMLPropertyHandler
-{
-public:
-    bool importXML(const OUString& /*rStrImpValue*/, css::uno::Any& /*rValue*/,
-                   const SvXMLUnitConverter&) const override
-    {
-        return false;
-    }
-
-    bool exportXML(OUString& /*rStrExpValue*/, const css::uno::Any& /*rValue*/,
-                   const SvXMLUnitConverter&) const override
-    {
-        return false;
-    }
-
-    bool equals(const css::uno::Any& rAny1, const css::uno::Any& rAny2) const override
-    {
-        uno::Reference<util::XComplexColor> xComplexColor1;
-        uno::Reference<util::XComplexColor> xComplexColor2;
-        rAny1 >>= xComplexColor1;
-        rAny2 >>= xComplexColor2;
-        model::ComplexColor aComplexColor1 = model::color::getFromXComplexColor(xComplexColor1);
-        model::ComplexColor aComplexColor2 = model::color::getFromXComplexColor(xComplexColor2);
-        return aComplexColor1 == aComplexColor2;
-    }
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx
deleted file mode 100644
index 70b915f17f59..000000000000
--- a/xmloff/inc/XMLElementPropertyContext.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/maptype.hxx>
-
-class SvXMLImport;
-
-
-class XMLElementPropertyContext : public SvXMLImportContext
-{
-    bool        bInsert;
-
-protected:
-
-    ::std::vector< XMLPropertyState > &rProperties;
-    XMLPropertyState aProp;
-
-    void SetInsert( bool bIns ) { bInsert = bIns; }
-
-public:
-
-    XMLElementPropertyContext( SvXMLImport& rImport, sal_Int32 nElement,
-                               XMLPropertyState aProp,
-                                ::std::vector< XMLPropertyState > &rProps );
-
-    virtual ~XMLElementPropertyContext() override;
-
-    virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
-};
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index 438f01c3a8ca..e3993b2853a3 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -23,7 +23,7 @@
 
 #include <memory>
 
-#include "XMLElementPropertyContext.hxx"
+#include <xmloff/XMLElementPropertyContext.hxx>
 
 class XMLTextColumnContext_Impl;
 class XMLTextColumnSepContext_Impl;
diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx
index c2e66f1a050d..e5ba010488e2 100644
--- a/xmloff/inc/xmltabi.hxx
+++ b/xmloff/inc/xmltabi.hxx
@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include "XMLElementPropertyContext.hxx"
+#include <xmloff/XMLElementPropertyContext.hxx>
 
 class SvXMLImport;
 class SvxXMLTabStopContext_Impl;
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
index 83e69f01a2ec..17e4d9546132 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
@@ -18,7 +18,7 @@
  */
 #pragma once
 
-#include <XMLElementPropertyContext.hxx>
+#include <xmloff/XMLElementPropertyContext.hxx>
 
 class XMLLabelSeparatorContext : public XMLElementPropertyContext
 {
diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx
index a4796775cd81..9df5dc2307eb 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.hxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.hxx
@@ -18,7 +18,7 @@
  */
 #pragma once
 
-#include <XMLElementPropertyContext.hxx>
+#include <xmloff/XMLElementPropertyContext.hxx>
 
 namespace com::sun::star {
     namespace io { class XOutputStream; }
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index 067e1e7d13a4..42cff9db52d8 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -19,7 +19,7 @@
 
 #include <XMLShapePropertySetContext.hxx>
 #include <XMLTextColumnsContext.hxx>
-#include <XMLComplexColorContext.hxx>
+#include <xmloff/XMLComplexColorContext.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmltabi.hxx>
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 7b805165bef8..521032ebfc7f 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -60,7 +60,7 @@
 #include <XMLIsPercentagePropertyHandler.hxx>
 #include <XMLPercentOrMeasurePropertyHandler.hxx>
 #include <XMLTextColumnsPropertyHandler.hxx>
-#include <XMLComplexColorHandler.hxx>
+#include <xmloff/XMLComplexColorHandler.hxx>
 #include <animations.hxx>
 #include <sax/tools/converter.hxx>
 #include <xmlsdtypes.hxx>
diff --git a/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx
index 6dd9c83ca062..1722375be709 100644
--- a/xmloff/source/style/XMLElementPropertyContext.cxx
+++ b/xmloff/source/style/XMLElementPropertyContext.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <XMLElementPropertyContext.hxx>
+#include <xmloff/XMLElementPropertyContext.hxx>
 #include <utility>
 
 
diff --git a/xmloff/source/text/XMLComplexColorContext.cxx b/xmloff/source/text/XMLComplexColorContext.cxx
index 3b0a8167ee6e..39b8687cbc51 100644
--- a/xmloff/source/text/XMLComplexColorContext.cxx
+++ b/xmloff/source/text/XMLComplexColorContext.cxx
@@ -18,7 +18,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmlprhdl.hxx>
-#include <XMLComplexColorContext.hxx>
+#include <xmloff/XMLComplexColorContext.hxx>
 
 using namespace css;
 using namespace xmloff::token;
diff --git a/xmloff/source/text/XMLComplexColorExport.cxx b/xmloff/source/text/XMLComplexColorExport.cxx
index c4554ad5ec3b..6d950dff3051 100644
--- a/xmloff/source/text/XMLComplexColorExport.cxx
+++ b/xmloff/source/text/XMLComplexColorExport.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <XMLComplexColorExport.hxx>
+#include <xmloff/XMLComplexColorExport.hxx>
 
 #include <sal/config.h>
 
diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx
index 983a4a82773b..bfe18db611cd 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 <XMLComplexColorContext.hxx>
+#include <xmloff/XMLComplexColorContext.hxx>
 #include <XMLBackgroundImageContext.hxx>
 #include "XMLSectionFootnoteConfigImport.hxx"
 
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 9d87a4879c32..729a94211e6a 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -27,8 +27,8 @@
 #include <xmloff/XMLEventsImportContext.hxx>
 #include <XMLShapePropertySetContext.hxx>
 #include <XMLTextColumnsContext.hxx>
-#include <XMLComplexColorContext.hxx>
 #include <XMLBackgroundImageContext.hxx>
+#include <xmloff/XMLComplexColorContext.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/maptype.hxx>
diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx
index 4a9d24b102ec..832761c95d9e 100644
--- a/xmloff/source/text/txtdropi.hxx
+++ b/xmloff/source/text/txtdropi.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <XMLElementPropertyContext.hxx>
+#include <xmloff/XMLElementPropertyContext.hxx>
 
 class XMLTextDropCapImportContext : public XMLElementPropertyContext
 {
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index 5a3d955e17d1..46af0cb2bfe0 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -24,7 +24,7 @@
 #include <xmltabe.hxx>
 #include <XMLTextColumnsExport.hxx>
 #include <XMLBackgroundImageExport.hxx>
-#include <XMLComplexColorExport.hxx>
+#include <xmloff/XMLComplexColorExport.hxx>
 
 class SvXMLExport;
 class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 165dbb851675..f7c3a9790dda 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -56,7 +56,7 @@
 #include <XMLFillBitmapSizePropertyHandler.hxx>
 #include <XMLBitmapLogicalSizePropertyHandler.hxx>
 #include <XMLBitmapRepeatOffsetPropertyHandler.hxx>
-#include <XMLComplexColorHandler.hxx>
+#include <xmloff/XMLComplexColorHandler.hxx>
 #include <vcl/graph.hxx>
 
 using namespace ::com::sun::star;