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>

13 files changed, 3 insertions, 50 deletions

diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 9e22dd5a346d..0c6646d11934 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -174,9 +174,6 @@ SvXMLImportContextRef OXMLCell::CreateChildContext(
     if ( m_xComponent.is() )
         m_pContainer->addCell(m_xComponent);
 
-    if( !pContext )
-        pContext = new SvXMLImportContext( GetImport(), _nPrefix, _rLocalName );
-
     return pContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index f2e949356053..6498296cc441 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -115,9 +115,6 @@ SvXMLImportContextRef OXMLRowColumn::CreateChildContext(
             break;
     }
 
-    if( !pContext )
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
     return pContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index df7b9b2444a4..3f31577f842f 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -141,9 +141,6 @@ SvXMLImportContextRef OXMLControlProperty::CreateChildContext(
             break;
     }
 
-    if( !pContext )
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
     return pContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 49f270760616..69dfc393ed28 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -231,9 +231,6 @@ SvXMLImportContextRef OXMLGroup::CreateChildContext(
             break;
     }
 
-    if( !pContext )
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
     return pContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx
index 3beed87e9f56..49df6b004de2 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.cxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx
@@ -96,9 +96,6 @@ SvXMLImportContextRef OXMLMasterFields::CreateChildContext(
             break;
     }
 
-    if( !pContext )
-        pContext = new SvXMLImportContext( GetImport(), _nPrefix, _rLocalName );
-
     return pContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 52079a32baae..5b7a7bfaf740 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -192,9 +192,6 @@ SvXMLImportContextRef OXMLReport::CreateChildContext(
             break;
     }
 
-    if (!xContext)
-        xContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
     return xContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index cff142c726eb..c01ae393dd56 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -113,10 +113,6 @@ SvXMLImportContextRef OXMLReportElement::CreateChildContext(
             break;
     }
 
-    if( !pContext )
-        pContext = new SvXMLImportContext( GetImport(), _nPrefix, _rLocalName );
-
-
     return pContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index 6d0a953ecca3..0963b2732439 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -54,8 +54,6 @@ SvXMLImportContextRef OXMLReportElementBase::CreateChildContext(
         const Reference< XAttributeList > & xAttrList )
 {
     SvXMLImportContextRef xContext = CreateChildContext_(nPrefix,rLocalName,xAttrList);
-    if (!xContext)
-        xContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
     return xContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx
index 430d9cdeee8b..72a4a69cec55 100644
--- a/reportdesign/source/filter/xml/xmlRow.cxx
+++ b/reportdesign/source/filter/xml/xmlRow.cxx
@@ -111,7 +111,7 @@ SvXMLImportContext* OXMLRow::CreateChildContext(
     }
 
     if( !pContext )
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+        pContext = xxx( GetImport(), nPrefix, rLocalName );
 
     return pContext;
 }
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index 4c398601f03a..0c5a647f8662 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -119,9 +119,6 @@ SvXMLImportContextRef OXMLSection::CreateChildContext(
             break;
     }
 
-    if( !pContext )
-        pContext = new SvXMLImportContext( rImport, _nPrefix, _rLocalName );
-
     return pContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index f6196d21e87d..ff97c749656b 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -98,9 +98,6 @@ SvXMLImportContextRef OXMLSubDocument::CreateChildContext_(
             break;
     }
 
-    if (!xContext)
-        xContext = new SvXMLImportContext( GetImport(), _nPrefix, _rLocalName );
-
     return xContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index af7272437ba4..7bf8e57123d2 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -150,9 +150,6 @@ SvXMLImportContextRef OXMLTable::CreateChildContext(
                 break;
     }
 
-    if( !pContext )
-        pContext = new SvXMLImportContext( rImport, _nPrefix, _rLocalName );
-
     return pContext;
 }
 
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 0787a313c5d7..2a510dee12af 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -600,10 +600,7 @@ public:
         {
             return new XMLDocumentSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList);
         }
-        else
-        {
-            return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
-        }
+        return nullptr;
     }
 };
 
@@ -650,9 +647,6 @@ public:
                 break;
         }
 
-        if (!pContext)
-            pContext = new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
-
         return pContext;
     }
 };
@@ -680,10 +674,7 @@ SvXMLImportContextRef RptXMLDocumentBodyContext::CreateChildContext(
         }
         return new OXMLReport(rImport, nPrefix, rLocalName, xAttrList, rImport.getReportDefinition());
     }
-    else
-    {
-        return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
-    }
+    return nullptr;
 }
 
 namespace {
@@ -723,9 +714,6 @@ public:
                 break;
         }
 
-        if (!pContext)
-            pContext = new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
-
         return pContext;
     }
 };
@@ -772,8 +760,6 @@ SvXMLImportContext *ORptFilter::CreateFastContext( sal_Int32 nElement,
             GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = CreateMetaContext( nElement );
             break;
-        default:
-            pContext = new SvXMLImportContext(*this);
     }
     return pContext;
 }