summaryrefslogtreecommitdiff
path: root/xmloff/source/meta
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-01-16 11:11:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-01-16 10:52:19 +0100
commit8041a9b1fd26b64494ecb4c23022f39bd168a24f (patch)
tree2ad86004de35a56859919b18f551b1dd92806eac /xmloff/source/meta
parentef5812deb142d043e58965bf8f4829b50acffcee (diff)
return nullptr from Create*Context methods in nullptr subclasses
the calling class handles this nicely, and also tells us when we are not handling some part of the XML file Change-Id: Ic51a42b9d2dec96243e7f83b528d7455d4bc0504 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86906 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/meta')
-rw-r--r--xmloff/source/meta/MetaImportComponent.cxx7
-rw-r--r--xmloff/source/meta/xmlversion.cxx6
2 files changed, 3 insertions, 10 deletions
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index c3cbdb03d2b2..fc8329fecff2 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -69,7 +69,7 @@ XMLMetaImportComponent::XMLMetaImportComponent(
}
SvXMLImportContext *XMLMetaImportComponent::CreateFastContext( sal_Int32 nElement,
- const uno::Reference< xml::sax::XFastAttributeList >& xAttrList )
+ const uno::Reference< xml::sax::XFastAttributeList >& /*xAttrList*/ )
{
if (nElement == XML_ELEMENT( OFFICE, XML_DOCUMENT_META ))
{
@@ -81,10 +81,7 @@ SvXMLImportContext *XMLMetaImportComponent::CreateFastContext( sal_Int32 nElemen
return new SvXMLMetaDocumentContext(
*this, mxDocProps);
}
- else
- {
- return SvXMLImport::CreateFastContext(nElement, xAttrList);
- }
+ return nullptr;
}
void SAL_CALL XMLMetaImportComponent::setTargetDocument(
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index ff53368af587..0055fb56d802 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -113,7 +113,7 @@ XMLVersionListImport::~XMLVersionListImport() throw()
{}
SvXMLImportContext *XMLVersionListImport::CreateFastContext( sal_Int32 nElement,
- const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >& xAttrList )
+ const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >& /*xAttrList*/ )
{
SvXMLImportContext *pContext = nullptr;
@@ -121,10 +121,6 @@ SvXMLImportContext *XMLVersionListImport::CreateFastContext( sal_Int32 nElement,
{
pContext = new XMLVersionListContext( *this );
}
- else
- {
- pContext = SvXMLImport::CreateFastContext( nElement, xAttrList );
- }
return pContext;
}