[Libreoffice-commits] core.git: xmloff/inc xmloff/Library_xo.mk xmloff/source
xmloff/Library_xo.mk |2 +-
xmloff/inc/XMLComplexColorExport.hxx |4 ++--
xmloff/source/text/XMLComplexColorExport.cxx |8
xmloff/source/text/txtexppr.cxx |4 ++--
xmloff/source/text/txtexppr.hxx |4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 66fff7efab4dd1ff08b43ed6d2d557ecad578509
Author: Tomaž Vajngerl
AuthorDate: Sat May 20 15:01:55 2023 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun May 21 12:59:53 2023 +0200
xmloff: rename XMLThemeColorExport to XMLComplexColorExport
Change-Id: I3d943f20e76b8f3e0409d307d11e3bf16489bf02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152050
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index d19aabd2d5ad..d2b539d514d9 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -303,6 +303,7 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/text/XMLChangeInfoContext \
xmloff/source/text/XMLChangedRegionImportContext \
xmloff/source/text/XMLComplexColorContext \
+xmloff/source/text/XMLComplexColorExport \
xmloff/source/text/XMLFootnoteBodyImportContext \
xmloff/source/text/XMLFootnoteConfigurationImportContext \
xmloff/source/text/XMLFootnoteImportContext \
@@ -341,7 +342,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/text/XMLTextCharStyleNamesElementExport \
xmloff/source/text/XMLTextColumnsContext \
xmloff/source/text/XMLTextColumnsExport \
-xmloff/source/text/XMLThemeColorExport \
xmloff/source/text/XMLTextFrameContext \
xmloff/source/text/XMLTextFrameHyperlinkContext \
xmloff/source/text/XMLTextHeaderFooterContext \
diff --git a/xmloff/inc/XMLThemeColorExport.hxx
b/xmloff/inc/XMLComplexColorExport.hxx
similarity index 89%
rename from xmloff/inc/XMLThemeColorExport.hxx
rename to xmloff/inc/XMLComplexColorExport.hxx
index 9a360c2782d2..d62e10fd5c1b 100644
--- a/xmloff/inc/XMLThemeColorExport.hxx
+++ b/xmloff/inc/XMLComplexColorExport.hxx
@@ -17,12 +17,12 @@ class Any;
}
class SvXMLExport;
-class XMLThemeColorExport
+class XMLComplexColorExport
{
SvXMLExport& mrExport;
public:
-XMLThemeColorExport(SvXMLExport& rExport);
+XMLComplexColorExport(SvXMLExport& rExport);
void exportXML(const css::uno::Any& rAny, sal_uInt16 nPrefix, const
OUString& rLocalName);
};
diff --git a/xmloff/source/text/XMLThemeColorExport.cxx
b/xmloff/source/text/XMLComplexColorExport.cxx
similarity index 91%
rename from xmloff/source/text/XMLThemeColorExport.cxx
rename to xmloff/source/text/XMLComplexColorExport.cxx
index 9a48faf63546..a118d12ba689 100644
--- a/xmloff/source/text/XMLThemeColorExport.cxx
+++ b/xmloff/source/text/XMLComplexColorExport.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include
+#include
#include
@@ -21,7 +21,7 @@
using namespace css;
using namespace ::xmloff::token;
-XMLThemeColorExport::XMLThemeColorExport(SvXMLExport& rExport)
+XMLComplexColorExport::XMLComplexColorExport(SvXMLExport& rExport)
: mrExport(rExport)
{
}
@@ -34,8 +34,8 @@ constexpr const std::array
constThemeColorTypeToToken{
};
}
-void XMLThemeColorExport::exportXML(const uno::Any& rAny, sal_uInt16 nPrefix,
-const OUString& rLocalName)
+void XMLComplexColorExport::exportXML(const uno::Any& rAny, sal_uInt16 nPrefix,
+ const OUString& rLocalName)
{
uno::Reference xComplexColor;
rAny >>= xComplexColor;
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 67f742b69b46..f49084d9cbe7 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -73,7 +73,7 @@ void XMLTextExportPropertySetMapper::handleElementItem(
break;
case CTF_COMPLEX_COLOR:
-pThis->maThemeColorExport.exportXML(rProperty.maValue,
+pThis->maComplexColorExport.exportXML(rProperty.maValue,
getPropertySetMapper()->GetEntryNameSpace(rProperty.mnIndex),
getPropertySetMapper()->GetEntryXMLName(rProperty.mnIndex));
break;
@@ -216,7 +216,7 @@
XMLTextExportPropertySetMapper::XMLTextExportPropertySetMapper(
maDropCapExport( rExp ),
maTabStopExport( rExp ),
maTextColumnsExport( rExp ),
-maThemeColorExport(rExp),
+maComplexColorExport(rExp),
maBackgroundImageExport( rExp )
{
}
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index 878ca9a9389d..5a3d955e17d1 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
class SvXMLExport;
class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper
@@ -53,7 +53,7 @@ private:
XMLTex
[Libreoffice-commits] core.git: xmloff/inc xmloff/Library_xo.mk xmloff/source
xmloff/Library_xo.mk |2 +-
xmloff/inc/XMLComplexColorContext.hxx |8
xmloff/source/draw/XMLShapePropertySetContext.cxx |4 ++--
xmloff/source/text/XMLComplexColorContext.cxx |8
xmloff/source/text/XMLTextPropertySetContext.cxx |4 ++--
xmloff/source/text/XMLTextShapeStyleContext.cxx |4 ++--
6 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit e1cc0f3e7adc9d4c930a1c37bbe45c69dd3725ab
Author: Tomaž Vajngerl
AuthorDate: Sat May 20 14:51:49 2023 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun May 21 12:59:35 2023 +0200
xmloff: rename XMLThemeColorContext to XMLComplexColorContext
Change-Id: I039aea6656cc8dedd74782f4fda8b0e1c25d3910
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152029
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
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
similarity index 72%
rename from xmloff/inc/XMLThemeColorContext.hxx
rename to 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
-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& xAttrList,
- const XMLPropertyState& rProp,
std::vector& rProps);
+XMLComplexColorContext(SvXMLImport& rImport, sal_Int32 nElement,
+ const
css::uno::Reference& xAttrList,
+ const XMLPropertyState& rProp,
std::vector& rProps);
css::uno::Reference 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
#include
-#include
+#include
#include
#include
#include
@@ -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
similarity index 95%
rename from xmloff/source/text/XMLThemeColorContext.cxx
rename to 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
#include
#include
-#include
+#include
using namespace css;
using namespace xmloff::token;
@@ -29,7 +29,7 @@ SvXMLEnumMapEntry 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& xAttrList, const
XMLPropertyState& rProp,
std::vector& rProps)
@@ -57,7 +57,7 @@ XMLThemeColorContext::XMLThemeColorContext(
}
css::uno::Reference
-XMLThemeCo
