[Libreoffice-commits] core.git: xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jan 20 14:42:27 UTC 2020
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 5 --
xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 6 ---
xmloff/source/chart/contexts.cxx | 1
xmloff/source/draw/XMLImageMapContext.cxx | 12 +-----
xmloff/source/draw/sdxmlimp.cxx | 4 --
xmloff/source/draw/ximp3dscene.cxx | 7 ---
xmloff/source/draw/ximpbody.cxx | 4 --
xmloff/source/draw/ximpcustomshape.cxx | 4 +-
xmloff/source/draw/ximpgrp.cxx | 5 --
xmloff/source/draw/ximplink.cxx | 3 -
xmloff/source/draw/ximppage.cxx | 8 ----
xmloff/source/draw/ximpshap.cxx | 7 ---
xmloff/source/draw/ximpstyl.cxx | 4 --
xmloff/source/forms/propertyimport.cxx | 10 +----
xmloff/source/script/xmlscripti.cxx | 8 ----
xmloff/source/style/XMLFontStylesContext.cxx | 4 +-
xmloff/source/table/XMLTableImport.cxx | 18 +++-------
xmloff/source/text/XMLChangeElementImportContext.cxx | 2 -
xmloff/source/text/XMLChangeInfoContext.cxx | 8 ----
xmloff/source/text/XMLChangedRegionImportContext.cxx | 11 ------
xmloff/source/text/XMLFootnoteImportContext.cxx | 6 ---
xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx | 3 -
xmloff/source/text/XMLIndexSourceBaseContext.cxx | 9 -----
xmloff/source/text/XMLIndexTOCContext.cxx | 9 -----
xmloff/source/text/XMLIndexTemplateContext.cxx | 8 ----
xmloff/source/text/XMLLineNumberingImportContext.cxx | 9 +----
xmloff/source/text/XMLTrackedChangesImportContext.cxx | 8 ----
xmloff/source/text/txtfldi.cxx | 14 +------
xmloff/source/text/txtparai.cxx | 8 ----
xmloff/source/text/txtvfldi.cxx | 6 ---
30 files changed, 32 insertions(+), 179 deletions(-)
New commits:
commit f3797630be6ab21179e2496cc56a6d41f0ee8144
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jan 20 15:28:45 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jan 20 15:41:53 2020 +0100
return nullptr from CreateChildContext methods in subclasses
the calling class handles this nicely, and also tells us when we are not
handling some part of the XML file
Change-Id: Ib64a704bc96bb4d6eff2d57116d62c9c15e25c6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87073
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index b83998b708cc..5ea889aa7621 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -621,15 +621,12 @@ SchXMLDataLabelContext::SchXMLDataLabelContext( SvXMLImport& rImport, const OUSt
SvXMLImportContextRef SchXMLDataLabelContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+ const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/ )
{
SvXMLImportContextRef xContext;
if ( IsXMLToken( rLocalName, XML_P ) && nPrefix == XML_NAMESPACE_TEXT )
xContext = new SchXMLDataLabelParaContext(GetImport(), rLocalName, mrLabels);
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
-
return xContext;
}
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
index 5977ef57abea..13a31686424e 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
@@ -88,7 +88,7 @@ void SchXMLRegressionCurveObjectContext::StartElement( const uno::Reference< xml
SvXMLImportContextRef SchXMLRegressionCurveObjectContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+ const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/ )
{
SvXMLImportContextRef xContext;
@@ -97,10 +97,6 @@ SvXMLImportContextRef SchXMLRegressionCurveObjectContext::CreateChildContext(
xContext = new SchXMLEquationContext(
mrImportHelper, GetImport(), nPrefix, rLocalName, maChartSize, mrRegressionStyleVector.back());
}
- else
- {
- xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
- }
return xContext;
}
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 9c668b89ee7e..d2059a1a44e7 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -107,7 +107,6 @@ SvXMLImportContextRef SchXMLDocContext::CreateChildContext(
case XML_TOK_DOC_META:
// we come here in the flat ODF file format,
// if XDocumentPropertiesSupplier is not supported at the model
- xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
break;
}
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index d44a90832161..ea802af8a915 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -212,7 +212,7 @@ void XMLImageMapObjectContext::EndElement()
SvXMLImportContextRef XMLImageMapObjectContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & /*xAttrList*/ )
{
if ( (XML_NAMESPACE_OFFICE == nPrefix) &&
IsXMLToken(rLocalName, XML_EVENT_LISTENERS) )
@@ -233,10 +233,7 @@ SvXMLImportContextRef XMLImageMapObjectContext::CreateChildContext(
return new XMLStringBufferImportContext(
GetImport(), nPrefix, rLocalName, sDescriptionBuffer);
}
- else
- return SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
-
+ return nullptr;
}
void XMLImageMapObjectContext::ProcessAttribute(
@@ -587,7 +584,7 @@ XMLImageMapContext::~XMLImageMapContext()
SvXMLImportContextRef XMLImageMapContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & /*xAttrList*/ )
{
SvXMLImportContextRef xContext;
@@ -609,9 +606,6 @@ SvXMLImportContextRef XMLImageMapContext::CreateChildContext(
GetImport(), nPrefix, rLocalName, xImageMap);
}
}
- else
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
return xContext;
}
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 10606f5c564e..66f6643d6215 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -194,10 +194,6 @@ SvXMLImportContextRef SdXMLDocContext_Impl::CreateChildContext(
}
}
- // call parent when no own context was created
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 9a2843dcc37e..2d9c1b479d38 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -199,13 +199,6 @@ SvXMLImportContextRef SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 n
GetImport(), nPrefix, rLocalName, xAttrList, mxChildren);
}
- // call parent when no own context was created
- if (!xContext)
- {
- xContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
- }
-
return xContext;
}
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index e2015aedf1e6..d6ff5ee2033e 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -346,10 +346,6 @@ SvXMLImportContextRef SdXMLBodyContext::CreateChildContext(
}
}
- // call parent when no own context was created
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 80955168676d..e7b1ba31211e 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -1298,7 +1298,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maHandles, EASGet( EAS_Handles ) );
}
-SvXMLImportContextRef XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const OUString& rLocalName,
+SvXMLImportContextRef XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 /*nPrefix*/,const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList> & xAttrList )
{
EnhancedCustomShapeTokenEnum aTokenEnum = EASGet( rLocalName );
@@ -1384,7 +1384,7 @@ SvXMLImportContextRef XMLEnhancedCustomShapeContext::CreateChildContext( sal_uIn
}
maHandles.push_back( comphelper::containerToSequence(aHandle) );
}
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ return nullptr;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index 549782fa41c0..9cc2aff111e8 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -69,11 +69,6 @@ SvXMLImportContextRef SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPr
GetImport(), nPrefix, rLocalName, xAttrList, mxChildren);
}
- // call parent when no own context was created
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index 9de9cb753cca..db28b619e026 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -62,8 +62,7 @@ SvXMLImportContextRef SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPre
return pContext;
}
- // call parent when no own context was created
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList);
+ return nullptr;
}
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index cd8d2b2a36de..4eff47a38f9c 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -176,10 +176,6 @@ SvXMLImportContextRef DrawAnnotationContext::CreateChildContext( sal_uInt16 nPre
}
}
- // call parent for content
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
-
return xContext;
}
@@ -274,10 +270,6 @@ SvXMLImportContextRef SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nP
GetImport(), nPrefix, rLocalName, xAttrList, mxShapes);
}
- // call parent when no own context was created
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 3594d1605363..76f534a9819b 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -251,10 +251,6 @@ SvXMLImportContextRef SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefi
}
}
- // call parent for content
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList );
-
return xContext;
}
@@ -3559,9 +3555,6 @@ SvXMLImportContextRef SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPr
}
}
}
- // call parent for content
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
return xContext;
}
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 070b9ecad1e3..1d05a80fbfad 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1450,10 +1450,6 @@ SvXMLImportContextRef SdXMLMasterStylesContext::CreateChildContext(
xContext = new SdXMLLayerSetContext( GetImport(), nPrefix, rLocalName, xAttrList );
}
- // call base class
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 0f296930aee8..b048653ca7df 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -258,20 +258,14 @@ OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16
}
SvXMLImportContextRef OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName,
- const Reference< XAttributeList >& _rxAttrList)
+ const Reference< XAttributeList >& /*_rxAttrList*/)
{
if( token::IsXMLToken( _rLocalName, token::XML_PROPERTIES) )
{
return new OPropertyElementsContext( m_rContext.getGlobalContext(),
_nPrefix, _rLocalName, this);
}
- else
- {
- OSL_FAIL(OStringBuffer("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is ").
- append(OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)).
- append(")!").getStr());
- return SvXMLImportContext::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList);
- }
+ return nullptr;
}
void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index 9b6850102f5a..e038515ed5f9 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -71,7 +71,7 @@ XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 n
SvXMLImportContextRef XMLScriptChildContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList >& xAttrList )
+ const Reference< xml::sax::XAttributeList >& /*xAttrList*/ )
{
SvXMLImportContextRef xContext;
@@ -83,9 +83,6 @@ SvXMLImportContextRef XMLScriptChildContext::CreateChildContext(
xContext = new XMLBasicImportContext( GetImport(), nPrefix, rLocalName, m_xModel );
}
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
-
return xContext;
}
@@ -141,9 +138,6 @@ SvXMLImportContextRef XMLScriptContext::CreateChildContext(
}
}
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLName, xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index cbb364663502..3a2840baa6e9 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -228,7 +228,7 @@ SvXMLImportContextRef XMLFontStyleContextFontFaceSrc::CreateChildContext(
{
if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, XML_FONT_FACE_URI ))
return new XMLFontStyleContextFontFaceUri( GetImport(), nPrefix, rLocalName, xAttrList, font );
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ return nullptr;
}
@@ -254,7 +254,7 @@ SvXMLImportContextRef XMLFontStyleContextFontFaceUri::CreateChildContext(
if( mxBase64Stream.is() )
return new XMLBase64ImportContext( GetImport(), nPrefix, rLocalName, xAttrList, mxBase64Stream );
}
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ return nullptr;
}
void XMLFontStyleContextFontFaceUri::SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName,
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 6caa85c9afbb..45b4693f7d35 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -181,8 +181,7 @@ SvXMLImportContextRef XMLProxyContext::CreateChildContext( sal_uInt16 nPrefix, c
{
if( mxParent.is() )
return mxParent->CreateChildContext( nPrefix, rLocalName, xAttrList );
- else
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ return nullptr;
}
@@ -366,7 +365,7 @@ XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImpo
{
}
-SvXMLImportContextRef XMLTableImportContext::ImportColumn( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContextRef XMLTableImportContext::ImportColumn( sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, const Reference< XAttributeList >& xAttrList )
{
if( mxColumns.is() && (mnCurrentRow == -1) ) try
{
@@ -419,7 +418,7 @@ SvXMLImportContextRef XMLTableImportContext::ImportColumn( sal_uInt16 nPrefix, c
OSL_FAIL("xmloff::XMLTableImportContext::ImportTableColumn(), exception caught!");
}
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList);
+ return nullptr;
}
void XMLTableImportContext::InitColumns()
@@ -558,7 +557,7 @@ SvXMLImportContextRef XMLTableImportContext::ImportCell( sal_uInt16 nPrefix, con
OSL_FAIL("xmloff::XMLTableImportContext::ImportCell(), exception caught!");
}
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList);
+ return nullptr;
}
SvXMLImportContextRef XMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
@@ -578,7 +577,7 @@ SvXMLImportContextRef XMLTableImportContext::CreateChildContext( sal_uInt16 nPre
}
}
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList);
+ return nullptr;
}
void XMLTableImportContext::StartElement( const Reference< XAttributeList >& /*xAttrList*/ )
@@ -713,10 +712,7 @@ SvXMLImportContextRef XMLCellImportContext::CreateChildContext( sal_uInt16 nPref
pContext = GetImport().GetTextImport()->CreateTextChildContext( GetImport(), nPrefix, rLocalName, xAttrList );
}
- if( pContext )
- return pContext;
- else
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList);
+ return pContext;
}
void XMLCellImportContext::EndElement()
@@ -824,7 +820,7 @@ SvXMLImportContextRef XMLTableTemplateContext::CreateChildContext( sal_uInt16 nP
}
}
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ return nullptr;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx
index c0cd5affc6f5..feb508c575fa 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.cxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.cxx
@@ -71,8 +71,6 @@ SvXMLImportContextRef XMLChangeElementImportContext::CreateChildContext(
// no text element
// illegal element content! TODO: discard this redline!
// for the moment -> use default
- xContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
}
}
diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx
index af12de858c20..326ce43b032a 100644
--- a/xmloff/source/text/XMLChangeInfoContext.cxx
+++ b/xmloff/source/text/XMLChangeInfoContext.cxx
@@ -56,7 +56,7 @@ void XMLChangeInfoContext::StartElement(const Reference<XAttributeList> &)
SvXMLImportContextRef XMLChangeInfoContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList >& xAttrList )
+ const Reference<XAttributeList >& /*xAttrList*/ )
{
SvXMLImportContextRef xContext;
@@ -77,12 +77,6 @@ SvXMLImportContextRef XMLChangeInfoContext::CreateChildContext(
rLocalName, sCommentBuffer);
}
- if (!xContext)
- {
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
- }
-
return xContext;
}
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index bf29d7390efd..44f68d98d2de 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -95,7 +95,7 @@ void XMLChangedRegionImportContext::StartElement(
SvXMLImportContextRef XMLChangedRegionImportContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList)
+ const Reference<XAttributeList> & /*xAttrList*/)
{
SvXMLImportContextRef xContext;
@@ -121,16 +121,7 @@ SvXMLImportContextRef XMLChangedRegionImportContext::CreateChildContext(
{
// illegal element content! TODO: discard the redlines
// for the moment -> use text
-
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
-
// or default if text fail
- if (!xContext)
- {
- xContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
- }
}
return xContext;
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx
index b77b740528b6..e4e222ddf6e7 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -209,12 +209,6 @@ SvXMLImportContextRef XMLFootnoteImportContext::CreateChildContext(
xContext = new XMLFootnoteBodyImportContext(GetImport(),
p_nPrefix, rLocalName);
break;
- default:
- // default:
- xContext = SvXMLImportContext::CreateChildContext(p_nPrefix,
- rLocalName,
- xAttrList);
- break;
}
return xContext;
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 17b3c3d64e14..b888d0a7e506 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -208,8 +208,7 @@ SvXMLImportContextRef XMLIndexBibliographyConfigurationContext::CreateChildConte
}
}
- return SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
+ return nullptr;
}
void XMLIndexBibliographyConfigurationContext::CreateAndInsert(bool)
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 8a86e3ee4e94..1a194c399f9d 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -215,7 +215,7 @@ void XMLIndexSourceBaseContext::EndElement()
SvXMLImportContextRef XMLIndexSourceBaseContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & /*xAttrList*/ )
{
SvXMLImportContextRef xContext;
@@ -238,13 +238,6 @@ SvXMLImportContextRef XMLIndexSourceBaseContext::CreateChildContext(
}
// else: unknown namespace -> ignore
- // use default context
- if (!xContext)
- {
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
- }
-
return xContext;
}
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index b17062e9cbce..a39e864d731e 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -276,7 +276,7 @@ void XMLIndexTOCContext::EndElement()
SvXMLImportContextRef XMLIndexTOCContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & /*xAttrList*/ )
{
SvXMLImportContextRef xContext;
@@ -345,13 +345,6 @@ SvXMLImportContextRef XMLIndexTOCContext::CreateChildContext(
}
// else: not valid -> ignore
- // default: ignore
- if (!xContext)
- {
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
- }
-
return xContext;
}
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index 4cf8c4c9cccd..85ec9b7bc088 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -217,7 +217,7 @@ SvXMLEnumMapEntry<TemplateTokenType> const aTemplateTokenTypeMap[] =
SvXMLImportContextRef XMLIndexTemplateContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & /*xAttrList*/ )
{
SvXMLImportContext* pContext = nullptr;
@@ -285,12 +285,6 @@ SvXMLImportContextRef XMLIndexTemplateContext::CreateChildContext(
}
// ignore unknown
- if (nullptr == pContext)
- {
- return SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
- }
-
return pContext;
}
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index e7d2ae824e55..63570b8710f8 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -261,7 +261,7 @@ void XMLLineNumberingImportContext::CreateAndInsert(bool)
SvXMLImportContextRef XMLLineNumberingImportContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & /*xAttrList*/ )
{
if ( (nPrefix == XML_NAMESPACE_TEXT) &&
IsXMLToken(rLocalName, XML_LINENUMBERING_SEPARATOR) )
@@ -270,12 +270,7 @@ SvXMLImportContextRef XMLLineNumberingImportContext::CreateChildContext(
nPrefix, rLocalName,
*this);
}
- else
- {
- // unknown element: default context
- return SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
- }
+ return nullptr;
}
void XMLLineNumberingImportContext::SetSeparatorText(
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index f554b9e9b5b3..2e9b670de2e2 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -79,7 +79,7 @@ void XMLTrackedChangesImportContext::StartElement(
SvXMLImportContextRef XMLTrackedChangesImportContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList)
+ const Reference<XAttributeList> & /*xAttrList*/)
{
SvXMLImportContextRef xContext;
@@ -90,12 +90,6 @@ SvXMLImportContextRef XMLTrackedChangesImportContext::CreateChildContext(
nPrefix, rLocalName);
}
- if (!xContext)
- {
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
- }
-
return xContext;
}
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index ea18f21f7ff7..6baf95ee1b18 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2427,7 +2427,7 @@ XMLMacroFieldImportContext::XMLMacroFieldImportContext(
SvXMLImportContextRef XMLMacroFieldImportContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & /*xAttrList*/ )
{
SvXMLImportContextRef xContext;
@@ -2440,9 +2440,6 @@ SvXMLImportContextRef XMLMacroFieldImportContext::CreateChildContext(
xEventContext = xContext;
bValid = true;
}
- else
- xContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
return xContext;
}
@@ -2699,7 +2696,7 @@ XMLDdeFieldDeclsImportContext::XMLDdeFieldDeclsImportContext(
SvXMLImportContextRef XMLDdeFieldDeclsImportContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & /*xAttrList*/ )
{
if ( (XML_NAMESPACE_TEXT == nPrefix) &&
(IsXMLToken(rLocalName, XML_DDE_CONNECTION_DECL)) )
@@ -2708,12 +2705,7 @@ SvXMLImportContextRef XMLDdeFieldDeclsImportContext::CreateChildContext(
return new XMLDdeFieldDeclImportContext(GetImport(), nPrefix,
rLocalName, aTokenMap);
}
- else
- {
- return SvXMLImportContext::CreateChildContext(nPrefix,
- rLocalName,
- xAttrList);
- }
+ return nullptr;
}
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index e836017f9396..3a86343f7864 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -697,9 +697,6 @@ SvXMLImportContextRef XMLImpRubyContext_Impl::CreateChildContext(
xAttrList,
*this );
}
- else
- xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName,
- xAttrList );
return xContext;
}
@@ -2318,11 +2315,6 @@ SvXMLImportContextRef XMLNumberedParaContext::CreateChildContext(
}
}
- if (!xContext) {
- xContext = SvXMLImportContext::CreateChildContext(
- i_nPrefix, i_rLocalName, i_xAttrList );
- }
-
return xContext;
}
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index e8b30eb39aa1..573d0ab9ae9d 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -690,12 +690,6 @@ SvXMLImportContextRef XMLVariableDeclsImportContext::CreateChildContext(
}
// if no context was created, use default context
- if (!xImportContext) {
- xImportContext = SvXMLImportContext::CreateChildContext(nPrefix,
- rLocalName,
- xAttrList);
- }
-
return xImportContext;
}
More information about the Libreoffice-commits
mailing list