xmloff: rename XMLThemeColorContext to XMLComplexColorContext

Change-Id: I039aea6656cc8dedd74782f4fda8b0e1c25d3910
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152029
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2023-05-20 14:51:49 +09:00
committed by Tomaž Vajngerl
parent 8843e4c441
commit e1cc0f3e7a
6 changed files with 15 additions and 15 deletions

View File

@@ -302,6 +302,7 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/text/XMLChangeImportContext \ xmloff/source/text/XMLChangeImportContext \
xmloff/source/text/XMLChangeInfoContext \ xmloff/source/text/XMLChangeInfoContext \
xmloff/source/text/XMLChangedRegionImportContext \ xmloff/source/text/XMLChangedRegionImportContext \
xmloff/source/text/XMLComplexColorContext \
xmloff/source/text/XMLFootnoteBodyImportContext \ xmloff/source/text/XMLFootnoteBodyImportContext \
xmloff/source/text/XMLFootnoteConfigurationImportContext \ xmloff/source/text/XMLFootnoteConfigurationImportContext \
xmloff/source/text/XMLFootnoteImportContext \ xmloff/source/text/XMLFootnoteImportContext \
@@ -340,7 +341,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/text/XMLTextCharStyleNamesElementExport \ xmloff/source/text/XMLTextCharStyleNamesElementExport \
xmloff/source/text/XMLTextColumnsContext \ xmloff/source/text/XMLTextColumnsContext \
xmloff/source/text/XMLTextColumnsExport \ xmloff/source/text/XMLTextColumnsExport \
xmloff/source/text/XMLThemeColorContext \
xmloff/source/text/XMLThemeColorExport \ xmloff/source/text/XMLThemeColorExport \
xmloff/source/text/XMLTextFrameContext \ xmloff/source/text/XMLTextFrameContext \
xmloff/source/text/XMLTextFrameHyperlinkContext \ xmloff/source/text/XMLTextFrameHyperlinkContext \

View File

@@ -13,13 +13,13 @@
#include "XMLElementPropertyContext.hxx" #include "XMLElementPropertyContext.hxx"
#include <docmodel/uno/UnoComplexColor.hxx> #include <docmodel/uno/UnoComplexColor.hxx>
class XMLThemeColorContext final : public XMLElementPropertyContext class XMLComplexColorContext final : public XMLElementPropertyContext
{ {
model::ComplexColor maComplexColor; model::ComplexColor maComplexColor;
sal_Int32 mnRootElement; sal_Int32 mnRootElement;
public: public:
XMLThemeColorContext(SvXMLImport& rImport, sal_Int32 nElement, XMLComplexColorContext(SvXMLImport& rImport, sal_Int32 nElement,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
const XMLPropertyState& rProp, std::vector<XMLPropertyState>& rProps); const XMLPropertyState& rProp, std::vector<XMLPropertyState>& rProps);

View File

@@ -19,7 +19,7 @@
#include <XMLShapePropertySetContext.hxx> #include <XMLShapePropertySetContext.hxx>
#include <XMLTextColumnsContext.hxx> #include <XMLTextColumnsContext.hxx>
#include <XMLThemeColorContext.hxx> #include <XMLComplexColorContext.hxx>
#include <xmloff/xmlimp.hxx> #include <xmloff/xmlimp.hxx>
#include <xmloff/xmlnumi.hxx> #include <xmloff/xmlnumi.hxx>
#include <xmltabi.hxx> #include <xmltabi.hxx>
@@ -84,7 +84,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLShapePropertySetCon
return new XMLTextColumnsContext(GetImport(), nElement, xAttrList, rProp, rProperties); return new XMLTextColumnsContext(GetImport(), nElement, xAttrList, rProp, rProperties);
case CTF_COMPLEX_COLOR: case CTF_COMPLEX_COLOR:
return new XMLThemeColorContext(GetImport(), nElement, xAttrList, rProp, rProperties); return new XMLComplexColorContext(GetImport(), nElement, xAttrList, rProp, rProperties);
} }
return SvXMLPropertySetContext::createFastChildContext( nElement, return SvXMLPropertySetContext::createFastChildContext( nElement,

View File

@@ -18,7 +18,7 @@
#include <xmloff/xmltoken.hxx> #include <xmloff/xmltoken.hxx>
#include <xmloff/xmlement.hxx> #include <xmloff/xmlement.hxx>
#include <xmloff/xmlprhdl.hxx> #include <xmloff/xmlprhdl.hxx>
#include <XMLThemeColorContext.hxx> #include <XMLComplexColorContext.hxx>
using namespace css; using namespace css;
using namespace xmloff::token; 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_ACCENT4, 7 }, { XML_ACCENT5, 8 }, { XML_ACCENT6, 9 }, { XML_HLINK, 10 },
{ XML_FOLHLINK, 11 }, { XML_TOKEN_INVALID, 0 } }; { XML_FOLHLINK, 11 }, { XML_TOKEN_INVALID, 0 } };
XMLThemeColorContext::XMLThemeColorContext( XMLComplexColorContext::XMLComplexColorContext(
SvXMLImport& rImport, sal_Int32 nElement, SvXMLImport& rImport, sal_Int32 nElement,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, const XMLPropertyState& rProp, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, const XMLPropertyState& rProp,
std::vector<XMLPropertyState>& rProps) std::vector<XMLPropertyState>& rProps)
@@ -57,7 +57,7 @@ XMLThemeColorContext::XMLThemeColorContext(
} }
css::uno::Reference<css::xml::sax::XFastContextHandler> css::uno::Reference<css::xml::sax::XFastContextHandler>
XMLThemeColorContext::createFastChildContext( XMLComplexColorContext::createFastChildContext(
sal_Int32 nElement, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList) sal_Int32 nElement, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList)
{ {
if (nElement == XML_ELEMENT(LO_EXT, XML_TRANSFORMATION)) if (nElement == XML_ELEMENT(LO_EXT, XML_TRANSFORMATION))
@@ -100,7 +100,7 @@ XMLThemeColorContext::createFastChildContext(
return nullptr; return nullptr;
} }
void XMLThemeColorContext::endFastElement(sal_Int32 nElement) void XMLComplexColorContext::endFastElement(sal_Int32 nElement)
{ {
if (nElement == mnRootElement) if (nElement == mnRootElement)
{ {

View File

@@ -20,7 +20,7 @@
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include "XMLTextPropertySetContext.hxx" #include "XMLTextPropertySetContext.hxx"
#include <XMLTextColumnsContext.hxx> #include <XMLTextColumnsContext.hxx>
#include <XMLThemeColorContext.hxx> #include <XMLComplexColorContext.hxx>
#include <XMLBackgroundImageContext.hxx> #include <XMLBackgroundImageContext.hxx>
#include "XMLSectionFootnoteConfigImport.hxx" #include "XMLSectionFootnoteConfigImport.hxx"
@@ -70,7 +70,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTextPropertySetCont
break; break;
case CTF_COMPLEX_COLOR: case CTF_COMPLEX_COLOR:
return new XMLThemeColorContext(GetImport(), nElement, xAttrList, rProp, rProperties); return new XMLComplexColorContext(GetImport(), nElement, xAttrList, rProp, rProperties);
break; break;
case CTF_DROPCAPFORMAT: case CTF_DROPCAPFORMAT:

View File

@@ -27,7 +27,7 @@
#include <xmloff/XMLEventsImportContext.hxx> #include <xmloff/XMLEventsImportContext.hxx>
#include <XMLShapePropertySetContext.hxx> #include <XMLShapePropertySetContext.hxx>
#include <XMLTextColumnsContext.hxx> #include <XMLTextColumnsContext.hxx>
#include <XMLThemeColorContext.hxx> #include <XMLComplexColorContext.hxx>
#include <XMLBackgroundImageContext.hxx> #include <XMLBackgroundImageContext.hxx>
#include <xmloff/txtprmap.hxx> #include <xmloff/txtprmap.hxx>
#include <xmloff/xmltypes.hxx> #include <xmloff/xmltypes.hxx>
@@ -91,7 +91,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTextShapePropertySe
break; break;
case CTF_COMPLEX_COLOR: case CTF_COMPLEX_COLOR:
return new XMLThemeColorContext(GetImport(), nElement, xAttrList, rProp, rProperties); return new XMLComplexColorContext(GetImport(), nElement, xAttrList, rProp, rProperties);
case CTF_BACKGROUND_URL: case CTF_BACKGROUND_URL:
DBG_ASSERT( rProp.mnIndex >= 3 && DBG_ASSERT( rProp.mnIndex >= 3 &&