extract some common code from ImportContext classes

which reduces code bloat, and lets us log when elements are ignored

Change-Id: I5ca12bc1fcbfa3bea49ebde819fd80bd233a96a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86338
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

11 files changed, 7 insertions, 45 deletions

diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 766f2f5e81a3..962fec96e6df 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -697,12 +697,10 @@ SvXMLImportContextRef SchXMLAxisContext::CreateChildContext(
             CreateGrid( sAutoStyleName, bIsMajor );
 
             // don't create a context => use default context. grid elements are empty
-            pContext = new SvXMLImportContext( GetImport(), p_nPrefix, rLocalName );
         }
         break;
 
         default:
-            pContext = new SvXMLImportContext( GetImport(), p_nPrefix, rLocalName );
             break;
     }
 
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index e5f677f3fa0e..f3bc2fa9e840 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -1121,9 +1121,6 @@ SvXMLImportContextRef SchXMLChartContext::CreateChildContext(
             break;
     }
 
-    if( ! pContext )
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
     return pContext;
 }
 
@@ -1238,8 +1235,6 @@ SvXMLImportContextRef SchXMLTitleContext::CreateChildContext(
     {
         pContext = new SchXMLParagraphContext( GetImport(), rLocalName, mrTitle );
     }
-    else
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
 
     return pContext;
 }
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index d0cd1f99c33e..9f8a59e0fe52 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -86,7 +86,7 @@ SchXMLImportHelper::SchXMLImportHelper() :
 
 SvXMLImportContext* SchXMLImportHelper::CreateChartContext(
     SvXMLImport& rImport,
-    sal_uInt16 nPrefix, const OUString& rLocalName,
+    sal_uInt16 /*nPrefix*/, const OUString& rLocalName,
     const Reference< frame::XModel >& rChartModel,
     const Reference< xml::sax::XAttributeList >& )
 {
@@ -101,7 +101,6 @@ SvXMLImportContext* SchXMLImportHelper::CreateChartContext(
     else
     {
         SAL_WARN("xmloff.chart", "No valid XChartDocument given as XModel" );
-        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
     }
 
     return pContext;
@@ -553,8 +552,7 @@ SvXMLImportContext *SchXMLImport::CreateFastContext( sal_Int32 nElement,
             }
         }
         break;
-        default:
-            pContext = new SvXMLImportContext( *this );
+        default: break;
     }
     return pContext;
 }
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx
index 65fcee594d77..9161cfad0e24 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -99,7 +99,7 @@ SvXMLImportContextRef SchXMLParagraphContext::CreateChildContext(
         }
     }
 
-    return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+    return nullptr;
 }
 
 void SchXMLParagraphContext::Characters( const OUString& rChars )
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index f488244e142f..b83998b708cc 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -494,9 +494,6 @@ SvXMLImportContextRef SchXMLPlotAreaContext::CreateChildContext(
             pContext = new SchXMLStockContext( mrImportHelper, GetImport(), nPrefix, rLocalName, mxDiagram,
                                                SchXMLStockContext::CONTEXT_TYPE_RANGE );
             break;
-
-        default:
-            pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
     }
 
     return pContext;
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 86c67f8834fa..a571430c28d0 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -696,9 +696,6 @@ SvXMLImportContextRef SchXMLSeries2Context::CreateChildContext(
                     GetImport(), rLocalName,
                     mrLSequencesPerIndex, m_xSeries );
             break;
-
-        default:
-            pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
     }
 
     return pContext;
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index ca52090960cc..69b738a66688 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -244,9 +244,6 @@ SvXMLImportContextRef SchXMLTableContext::CreateChildContext(
         case XML_TOK_TABLE_ROW:
             pContext = new SchXMLTableRowContext( mrImportHelper, GetImport(), rLocalName, mrTable );
             break;
-
-        default:
-            pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
     }
 
     return pContext;
@@ -413,8 +410,6 @@ SvXMLImportContextRef SchXMLTableColumnsContext::CreateChildContext(
     {
         pContext = new SchXMLTableColumnContext( GetImport(), rLocalName, mrTable );
     }
-    else
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
 
     return pContext;
 }
@@ -507,10 +502,6 @@ SvXMLImportContextRef SchXMLTableRowsContext::CreateChildContext(
     {
         pContext = new SchXMLTableRowContext( mrImportHelper, GetImport(), rLocalName, mrTable );
     }
-    else
-    {
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-    }
 
     return pContext;
 }
@@ -553,7 +544,7 @@ SvXMLImportContextRef SchXMLTableRowContext::CreateChildContext(
     }
     else
     {
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+        assert(false);
     }
 
     return pContext;
@@ -683,10 +674,6 @@ SvXMLImportContextRef SchXMLTableCellContext::CreateChildContext(
         //so we need to find an alternative to save that range info for copy/paste scenario ... -> use description at an empty group element for now
         pContext = new SchXMLRangeSomewhereContext( GetImport(), nPrefix, rLocalName, maRangeId );
     }
-    else
-    {
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-    }
 
     return pContext;
 }
@@ -1076,7 +1063,7 @@ SvXMLImportContextRef SchXMLRangeSomewhereContext::CreateChildContext(
         return new XMLStringBufferImportContext(
             GetImport(), nPrefix, rLocalName, maRangeStringBuffer );
     }
-    return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+    return nullptr;
 }
 
 void SchXMLRangeSomewhereContext::EndElement()
diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx
index 7f65edb2cd30..a494c79a0cb3 100644
--- a/xmloff/source/chart/SchXMLTextListContext.cxx
+++ b/xmloff/source/chart/SchXMLTextListContext.cxx
@@ -74,8 +74,6 @@ SvXMLImportContextRef SchXMLListItemContext::CreateChildContext(
     if( (nPrefix == XML_NAMESPACE_TEXT ||
                 nPrefix == XML_NAMESPACE_LO_EXT) && IsXMLToken( rLocalName, XML_P ) )
         pContext = new SchXMLParagraphContext( GetImport(), rLocalName, m_rText );
-    else
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
     return pContext;
 }
 
@@ -115,8 +113,6 @@ SvXMLImportContextRef SchXMLTextListContext::CreateChildContext(
         m_aTextVector.emplace_back( );
         pContext = new SchXMLListItemContext( GetImport(), rLocalName, m_aTextVector.back() );
     }
-    else
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
     return pContext;
 }
 
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
index 2ef83157e82d..dec08c2ad3da 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
@@ -45,7 +45,7 @@ void XMLLabelSeparatorContext::StartElement( const uno::Reference< xml::sax::XAt
 }
 
 SvXMLImportContextRef XMLLabelSeparatorContext::CreateChildContext(
-    sal_uInt16 nPrefix, const OUString& rLocalName,
+    sal_uInt16 /*nPrefix*/, const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/ )
 {
     SvXMLImportContext* pContext = nullptr;
@@ -54,8 +54,6 @@ SvXMLImportContextRef XMLLabelSeparatorContext::CreateChildContext(
         pContext = new SchXMLParagraphContext( GetImport(),
                             rLocalName, m_aSeparator );
     }
-    if( !pContext )
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
 
     return pContext;
 }
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index 36fd0eafa6e9..be661375cff0 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -109,10 +109,6 @@ SvXMLImportContextRef XMLSymbolImageContext::CreateChildContext(
                                                        mxBase64Stream );
         }
     }
-    if( ! pContext )
-    {
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-    }
 
     return pContext;
 }
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 62bebf34ded9..9f4a178590cf 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -142,7 +142,7 @@ SvXMLImportContextRef SchXMLDocContext::CreateChildContext(
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SchXMLDocContext::createFastChildContext(
     sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList >& /*xAttrList*/ )
 {
-    return new SvXMLImportContext( GetImport() );
+    return nullptr;
 }
 
 SchXMLFlatDocContext_Impl::SchXMLFlatDocContext_Impl(