include/xmloff/XMLComplexColorContext.hxx | 5 +++--
include/xmloff/XMLComplexColorExport.hxx | 3 ++-
include/xmloff/XMLComplexColorHandler.hxx | 3 ++-
solenv/clang-format/excludelist | 2 +-
xmloff/inc/XMLBackgroundImageContext.hxx | 2 +-
xmloff/inc/XMLTextColumnsContext.hxx | 2 +-
xmloff/inc/xmltabi.hxx | 2 +-
xmloff/source/chart/XMLLabelSeparatorContext.hxx | 2 +-
xmloff/source/chart/XMLSymbolImageContext.hxx | 2 +-
xmloff/source/draw/XMLShapePropertySetContext.cxx | 2 +-
xmloff/source/draw/sdpropls.cxx | 2 +-
xmloff/source/style/XMLElementPropertyContext.cxx | 2 +-
xmloff/source/text/XMLComplexColorContext.cxx | 2 +-
xmloff/source/text/XMLComplexColorExport.cxx | 2 +-
xmloff/source/text/XMLTextPropertySetContext.cxx | 2 +-
xmloff/source/text/XMLTextShapeStyleContext.cxx | 2 +-
xmloff/source/text/txtdropi.hxx | 2 +-
xmloff/source/text/txtexppr.hxx | 2 +-
xmloff/source/text/txtprhdl.cxx | 2 +-
19 files changed, 23 insertions(+), 20 deletions(-)
New commits:
commit 1db0bac33812a7da0c4ca4c5be0f5a88c9eb2649
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Tue Jul 18 13:18:11 2023 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Jul 18 17:51:43 2023 +0200
xmloff: move XMLComplexColor* import/export classes to public include
Change-Id: I52aad31f63858eba905481812cbf971493252642
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154570
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit 2455826917868a5da5ab1bb4586e067d6c968c43)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154547
diff --git a/xmloff/inc/XMLComplexColorContext.hxx
b/include/xmloff/XMLComplexColorContext.hxx
similarity index 87%
rename from xmloff/inc/XMLComplexColorContext.hxx
rename to include/xmloff/XMLComplexColorContext.hxx
index 2d43da23fedd..cbb785994169 100644
--- a/xmloff/inc/XMLComplexColorContext.hxx
+++ b/include/xmloff/XMLComplexColorContext.hxx
@@ -9,11 +9,12 @@
#pragma once
+#include <xmloff/dllapi.h>
#include <memory>
-#include "XMLElementPropertyContext.hxx"
+#include <xmloff/XMLElementPropertyContext.hxx>
#include <docmodel/uno/UnoComplexColor.hxx>
-class XMLComplexColorContext final : public XMLElementPropertyContext
+class XMLOFF_DLLPUBLIC XMLComplexColorContext final : public
XMLElementPropertyContext
{
model::ComplexColor maComplexColor;
sal_Int32 mnRootElement;
diff --git a/xmloff/inc/XMLComplexColorExport.hxx
b/include/xmloff/XMLComplexColorExport.hxx
similarity index 90%
rename from xmloff/inc/XMLComplexColorExport.hxx
rename to include/xmloff/XMLComplexColorExport.hxx
index d62e10fd5c1b..28911737ff89 100644
--- a/xmloff/inc/XMLComplexColorExport.hxx
+++ b/include/xmloff/XMLComplexColorExport.hxx
@@ -8,6 +8,7 @@
*/
#pragma once
+#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -17,7 +18,7 @@ class Any;
}
class SvXMLExport;
-class XMLComplexColorExport
+class XMLOFF_DLLPUBLIC XMLComplexColorExport
{
SvXMLExport& mrExport;
diff --git a/xmloff/inc/XMLComplexColorHandler.hxx
b/include/xmloff/XMLComplexColorHandler.hxx
similarity index 93%
rename from xmloff/inc/XMLComplexColorHandler.hxx
rename to include/xmloff/XMLComplexColorHandler.hxx
index 052b0db6c1d4..8d40c8459f30 100644
--- a/xmloff/inc/XMLComplexColorHandler.hxx
+++ b/include/xmloff/XMLComplexColorHandler.hxx
@@ -9,12 +9,13 @@
#pragma once
+#include <xmloff/dllapi.h>
#include <docmodel/uno/UnoComplexColor.hxx>
using namespace ::xmloff::token;
using namespace css;
-class XMLComplexColorHandler : public XMLPropertyHandler
+class XMLOFF_DLLPUBLIC XMLComplexColorHandler : public XMLPropertyHandler
{
public:
bool importXML(const OUString& /*rStrImpValue*/, css::uno::Any& /*rValue*/,
diff --git a/xmloff/inc/XMLElementPropertyContext.hxx
b/include/xmloff/XMLElementPropertyContext.hxx
similarity index 100%
rename from xmloff/inc/XMLElementPropertyContext.hxx
rename to include/xmloff/XMLElementPropertyContext.hxx
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index a18b5396e41b..7b200dc28480 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6433,6 +6433,7 @@ include/xmloff/SinglePropertySetInfoCache.hxx
include/xmloff/XMLBase64ImportContext.hxx
include/xmloff/XMLCharContext.hxx
include/xmloff/XMLConstantsPropertyHandler.hxx
+include/xmloff/XMLElementPropertyContext.hxx
include/xmloff/XMLEventExport.hxx
include/xmloff/XMLEventsImportContext.hxx
include/xmloff/XMLFilterServiceNames.h
@@ -15297,7 +15298,6 @@ xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
xmloff/inc/XMLChartPropertySetMapper.hxx
xmloff/inc/XMLChartStyleContext.hxx
xmloff/inc/XMLClipPropertyHandler.hxx
-xmloff/inc/XMLElementPropertyContext.hxx
xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
xmloff/inc/XMLEmbeddedObjectImportContext.hxx
xmloff/inc/XMLEventImportHelper.hxx
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/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 2928ff905638..9d899dccf643 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;
