[Libreoffice-commits] core.git: include/xmloff sc/source xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sat Dec 21 07:26:41 UTC 2019
include/xmloff/xmlstyle.hxx | 4 --
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 20 --------------
xmloff/source/core/DocumentSettingsContext.cxx | 11 --------
xmloff/source/style/xmlnumfi.cxx | 22 ----------------
xmloff/source/style/xmlstyle.cxx | 7 -----
xmloff/source/style/xmltabi.cxx | 12 --------
xmloff/source/text/XMLSectionSourceDDEImportContext.cxx | 9 ------
xmloff/source/text/XMLSectionSourceDDEImportContext.hxx | 5 ---
xmloff/source/text/XMLSectionSourceImportContext.cxx | 9 ------
xmloff/source/text/XMLSectionSourceImportContext.hxx | 5 ---
10 files changed, 104 deletions(-)
New commits:
commit a445b24d1eef6b81db962894d4c3990e1067f4ad
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Dec 20 14:35:44 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Dec 21 08:25:23 2019 +0100
remove unnecessary CreateChildContext methods
that do the same as the base class method
Change-Id: I5048edf9d5fa40bb4ebdd96d9b13c303fb061945
Reviewed-on: https://gerrit.libreoffice.org/85646
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index bf0e77098ced..a18070f6a747 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -99,10 +99,6 @@ public:
virtual ~SvXMLStyleContext() override;
- virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
-
virtual void StartElement(
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 2b0e2afa0171..4374f90362e3 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -266,9 +266,6 @@ public:
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
- virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void EndElement() override;
};
@@ -279,9 +276,6 @@ public:
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
- virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void EndElement() override;
};
@@ -1183,13 +1177,6 @@ ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport,
pChangeTrackingImportHelper->SetInsertionCutOff(nID, nPosition);
}
-SvXMLImportContextRef ScXMLInsertionCutOffContext::CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ )
-{
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-}
-
void ScXMLInsertionCutOffContext::EndElement()
{
}
@@ -1241,13 +1228,6 @@ ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport,
pChangeTrackingImportHelper->AddMoveCutOff(nID, nStartPosition, nEndPosition);
}
-SvXMLImportContextRef ScXMLMovementCutOffContext::CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ )
-{
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-}
-
void ScXMLMovementCutOffContext::EndElement()
{
}
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 087bf2d34b4b..13bb5e1214db 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -152,9 +152,6 @@ public:
const OUString& rItemName,
XMLConfigBaseContext* pBaseContext);
- virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void Characters( const OUString& rChars ) override;
virtual void EndElement() override;
@@ -479,14 +476,6 @@ XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrf
}
}
-SvXMLImportContextRef XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList>& )
-{
- SvXMLImportContext* pContext = new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
- return pContext;
-}
-
void XMLConfigItemContext::Characters( const OUString& rChars )
{
if (IsXMLToken(msType, XML_BASE64BINARY))
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 4d3c334668be..d014b658750a 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -153,9 +153,6 @@ public:
SvXMLNumFmtElementContext& rParentContext,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList );
- virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void Characters( const OUString& rChars ) override;
virtual void EndElement() override;
};
@@ -191,9 +188,6 @@ public:
SvXMLNumFormatContext& rParentContext,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList );
- virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void Characters( const OUString& rChars ) override;
virtual void EndElement() override;
};
@@ -653,14 +647,6 @@ SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport,
}
}
-SvXMLImportContextRef SvXMLNumFmtPropContext::CreateChildContext(
- sal_uInt16 nPrfx, const OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& )
-{
- // no elements supported - use default context
- return new SvXMLImportContext( GetImport(), nPrfx, rLName );
-}
-
void SvXMLNumFmtPropContext::Characters( const OUString& )
{
}
@@ -700,14 +686,6 @@ SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rIm
}
}
-SvXMLImportContextRef SvXMLNumFmtEmbeddedTextContext::CreateChildContext(
- sal_uInt16 nPrfx, const OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& )
-{
- // no elements supported - use default context
- return new SvXMLImportContext( GetImport(), nPrfx, rLName );
-}
-
void SvXMLNumFmtEmbeddedTextContext::Characters( const OUString& rChars )
{
aContent.append( rChars );
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 17e72b70b62b..8d32d38396f2 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -158,13 +158,6 @@ SvXMLStyleContext::~SvXMLStyleContext()
{
}
-SvXMLImportContextRef SvXMLStyleContext::CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & )
-{
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-}
-
void SvXMLStyleContext::StartElement( const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 158d696393fc..1ad85eb3cfb3 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -66,10 +66,6 @@ public:
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
- virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override;
-
const style::TabStop& getTabStop() const { return aTabStop; }
};
@@ -153,14 +149,6 @@ SvxXMLTabStopContext_Impl::SvxXMLTabStopContext_Impl(
aTabStop.FillChar = cTextFillChar;
}
-SvXMLImportContextRef SvxXMLTabStopContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & )
-{
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-}
-
SvxXMLTabStopImportContext::SvxXMLTabStopImportContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index 3969baba9cc0..658056968b16 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -156,13 +156,4 @@ void XMLSectionSourceDDEImportContext::EndElement()
// nothing to be done!
}
-SvXMLImportContextRef XMLSectionSourceDDEImportContext::CreateChildContext(
- sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const Reference<XAttributeList> & )
-{
- // ignore -> default context
- return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
index e1b9b0e9565a..8d6c2b1ddcc9 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
@@ -49,11 +49,6 @@ protected:
const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
virtual void EndElement() override;
-
- virtual SvXMLImportContextRef CreateChildContext(
- sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
};
#endif
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index ec6bd06dec27..2ae4e671f7c0 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -132,13 +132,4 @@ void XMLSectionSourceImportContext::EndElement()
// this space intentionally left blank.
}
-SvXMLImportContextRef XMLSectionSourceImportContext::CreateChildContext(
- sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const Reference<XAttributeList> & )
-{
- // ignore -> default context
- return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx
index f47e36235705..865e9753ff6f 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx
@@ -49,11 +49,6 @@ protected:
const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
virtual void EndElement() override;
-
- virtual SvXMLImportContextRef CreateChildContext(
- sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
};
#endif
More information about the Libreoffice-commits
mailing list