diff options
-rw-r--r-- | xmloff/Library_xo.mk | 2 | ||||
-rw-r--r-- | xmloff/inc/XMLComplexColorExport.hxx (renamed from xmloff/inc/XMLThemeColorExport.hxx) | 4 | ||||
-rw-r--r-- | xmloff/source/text/XMLComplexColorExport.cxx (renamed from xmloff/source/text/XMLThemeColorExport.cxx) | 8 | ||||
-rw-r--r-- | xmloff/source/text/txtexppr.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/txtexppr.hxx | 4 |
5 files changed, 11 insertions, 11 deletions
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 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 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 <XMLThemeColorExport.hxx> +#include <XMLComplexColorExport.hxx> #include <sal/config.h> @@ -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<XMLTokenEnum, 12> 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<util::XComplexColor> 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 <xmltabe.hxx> #include <XMLTextColumnsExport.hxx> #include <XMLBackgroundImageExport.hxx> -#include <XMLThemeColorExport.hxx> +#include <XMLComplexColorExport.hxx> class SvXMLExport; class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper @@ -53,7 +53,7 @@ private: XMLTextDropCapExport maDropCapExport; SvxXMLTabStopExport maTabStopExport; XMLTextColumnsExport maTextColumnsExport; - XMLThemeColorExport maThemeColorExport; + XMLComplexColorExport maComplexColorExport; XMLBackgroundImageExport maBackgroundImageExport; /** Application-specific filter. By default do nothing. */ |