sw/source/filter/xml/xmlfmt.cxx | 4 ----
xmloff/source/draw/ximpstyl.cxx | 8 --------
xmloff/source/style/XMLFontStylesContext.cxx | 4 ++--
xmloff/source/style/prstylei.cxx | 4 ----
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 11 +----------
xmloff/source/text/XMLTextMasterPageContext.cxx | 5 -----
6 files changed, 3 insertions(+), 33 deletions(-)
New commits:
commit 48291e148c97cf48d25425e81b045e7feddd5b50
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Aug 21 09:46:48 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 21 16:01:58 2020 +0200
no need to call superclass here
there is no CreateChildContext in the superclass
(and the next implementation of that method that is actually called is
not going to do anything useful here)
Change-Id: I503924eaaef8f450549c2eaa2195661ce0de8c2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101136
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 5bd4debc2d27..49e1224cdb83 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -651,10 +651,6 @@ SvXMLImportContextRef
SwXMLItemSetStyleContext_Impl::CreateChildContext(
}
}
- if (!xContext)
- xContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName,
- xAttrList );
-
return xContext;
}
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 6aee9df7f8ac..4e638adc1c5b 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -430,10 +430,6 @@ SvXMLImportContextRef
SdXMLPageMasterContext::CreateChildContext(
xContext = mxPageMasterStyle.get();
}
- // call base class
- if (!xContext)
- xContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName,
xAttrList);
-
return xContext;
}
@@ -467,10 +463,6 @@ SvXMLImportContextRef
SdXMLPresentationPageLayoutContext::CreateChildContext(
maList.push_back(xLclContext);
}
- // call base class
- if (!xContext)
- xContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName,
xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx
b/xmloff/source/style/XMLFontStylesContext.cxx
index 450525fe795c..e17b79bd6ecb 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -179,11 +179,11 @@ void XMLFontStyleContextFontFace::FillProperties(
SvXMLImportContextRef XMLFontStyleContextFontFace::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList
)
+ const css::uno::Reference< css::xml::sax::XAttributeList > & )
{
if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName,
XML_FONT_FACE_SRC ))
return new XMLFontStyleContextFontFaceSrc( GetImport(), nPrefix,
rLocalName, *this );
- return SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName,
xAttrList );
+ return nullptr;
}
OUString XMLFontStyleContextFontFace::familyName() const
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 1222fbd50ca7..02362142ee41 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -220,10 +220,6 @@ SvXMLImportContextRef
XMLPropStyleContext::CreateChildContext(
xImpPrMap );
}
- if (!xContext)
- xContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName,
- xAttrList );
-
return xContext;
}
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 7897ce908e20..ea03a0589969 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -277,7 +277,7 @@ void XMLFootnoteConfigurationImportContext::SetAttribute(
sal_uInt16 nPrefixKey,
SvXMLImportContextRef
XMLFootnoteConfigurationImportContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & )
{
SvXMLImportContextRef xContext;
@@ -303,15 +303,6 @@ SvXMLImportContextRef
XMLFootnoteConfigurationImportContext::CreateChildContext(
}
// else: unknown namespace -> default context
}
- // else: endnote -> default context
-
- if (!xContext)
- {
- // default: delegate to super class
- xContext = SvXMLStyleContext::CreateChildContext(nPrefix,
- rLocalName,
- xAttrList);
- }
return xContext;
}
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx
b/xmloff/source/text/XMLTextMasterPageContext.cxx
index 4fdc4c3f83d3..1b70be760b25 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -235,11 +235,6 @@ SvXMLImportContextRef
XMLTextMasterPageContext::CreateChildContext(
xAttrList,
bFooter, bLeft, bFirst );
}
- else
- {
- xContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName,
- xAttrList );
- }
return xContext;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
