diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-02 11:22:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-15 08:33:29 +0200 |
| commit | b3dfb1e807eba91eed35a02d74fe8a917c41ee6f (patch) | |
| tree | 821c7c364e8550fdba804a45c50524cc9ac83310 /sc/source/filter/xml | |
| parent | 48fedbfb73fb3bb0abd9f5201d6d7ecc6e9ed6ef (diff) | |
loplugin:checkunusedparams in sc
Change-Id: Ib4572899caeb7bc2dceb2c188ceb306b8ffc9193
Reviewed-on: https://gerrit.libreoffice.org/40629
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/filter/xml')
58 files changed, 322 insertions, 469 deletions
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 81fc1744ab4c..896e2e12b8ab 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; using namespace xmloff::token; ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList) : ScXMLImportContext( rImport ), fIterationEpsilon(0.001), @@ -102,9 +101,9 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLCalculationSetting SvXMLImportContext *pContext = nullptr; if (nElement == XML_ELEMENT( TABLE, XML_NULL_DATE )) - pContext = new ScXMLNullDateContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLNullDateContext(GetScImport(), xAttrList, this); else if (nElement == XML_ELEMENT( TABLE, XML_ITERATION )) - pContext = new ScXMLIterationContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLIterationContext(GetScImport(), xAttrList, this); if( !pContext ) pContext = new SvXMLImportContext( GetImport() ); @@ -143,7 +142,6 @@ void SAL_CALL ScXMLCalculationSettingsContext::endFastElement( sal_Int32 /*nElem } ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : ScXMLImportContext( rImport ) @@ -178,7 +176,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLNullDateContext::c } ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : ScXMLImportContext( rImport ) diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 08c4e03cebd0..6614ab93e9a7 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -41,7 +41,7 @@ class ScXMLCalculationSettingsContext : public ScXMLImportContext bool bMatchWholeCell; public: - ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLCalculationSettingsContext( ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList); virtual ~ScXMLCalculationSettingsContext() override; @@ -59,7 +59,7 @@ public: class ScXMLNullDateContext : public ScXMLImportContext { public: - ScXMLNullDateContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLNullDateContext( ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLNullDateContext() override; @@ -71,7 +71,7 @@ public: class ScXMLIterationContext : public ScXMLImportContext { public: - ScXMLIterationContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLIterationContext( ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLIterationContext() override; diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index 60a718196f1c..f6ba8340124f 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx @@ -37,7 +37,6 @@ ScMyImpCellRangeSource::ScMyImpCellRangeSource() : ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList >& xAttrList, ScMyImpCellRangeSource* pCellRangeSource ) : ScXMLImportContext( rImport ) diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index a7725601b73f..c86d5fb54cc5 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -43,7 +43,6 @@ class ScXMLCellRangeSourceContext : public ScXMLImportContext public: ScXMLCellRangeSourceContext( ScXMLImport& rImport, - sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList, ScMyImpCellRangeSource* pCellRangeSource ); diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index cf4c16e4a9ae..37aa4c61e9b7 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -31,7 +31,6 @@ using namespace xmloff::token; ScXMLConsolidationContext::ScXMLConsolidationContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) : ScXMLImportContext( rImport ), eFunction( SUBTOTAL_FUNC_NONE ), diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index cfc0097182d4..e697497c2c6c 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -40,7 +40,6 @@ private: public: ScXMLConsolidationContext( ScXMLImport& rImport, - sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ); virtual ~ScXMLConsolidationContext() override; diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index faaab9888728..b91cd269695b 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -31,9 +31,7 @@ using namespace com::sun::star; using namespace xmloff::token; -ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */ ) : +ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport ) : ScXMLImportContext( rImport ) { // here are no attributes @@ -46,12 +44,12 @@ ScXMLDDELinksContext::~ScXMLDDELinksContext() } uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDELinksContext::createFastChildContext( - sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) + sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList >& /*xAttrList*/ ) { SvXMLImportContext *pContext = nullptr; if ( nElement == XML_ELEMENT( TABLE, XML_DDE_LINK) ) - pContext = new ScXMLDDELinkContext(GetScImport(), nElement, xAttrList); + pContext = new ScXMLDDELinkContext(GetScImport()); if( !pContext ) pContext = new SvXMLImportContext( GetImport() ); @@ -59,9 +57,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDELinksContext::c return pContext; } -ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */ ) : +ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport ) : ScXMLImportContext( rImport ), aDDELinkTable(), aDDELinkRow(), @@ -88,10 +84,10 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDELinkContext::cr switch (nElement) { case XML_ELEMENT( OFFICE, XML_DDE_SOURCE ): - pContext = new ScXMLDDESourceContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDDESourceContext(GetScImport(), xAttrList, this); break; case XML_ELEMENT( TABLE, XML_TABLE ): - pContext = new ScXMLDDETableContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDDETableContext(GetScImport(), this); break; } @@ -186,7 +182,6 @@ void SAL_CALL ScXMLDDELinkContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : ScXMLImportContext( rImport ), @@ -233,8 +228,6 @@ void SAL_CALL ScXMLDDESourceContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */, ScXMLDDELinkContext* pTempDDELink) : ScXMLImportContext( rImport ), pDDELink(pTempDDELink) @@ -254,10 +247,10 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDETableContext::c switch (nElement) { case XML_ELEMENT( TABLE, XML_TABLE_COLUMN ): - pContext = new ScXMLDDEColumnContext(GetScImport(), nElement, xAttrList, pDDELink); + pContext = new ScXMLDDEColumnContext(GetScImport(), xAttrList, pDDELink); break; case XML_ELEMENT( TABLE, XML_TABLE_ROW ): - pContext = new ScXMLDDERowContext(GetScImport(), nElement, xAttrList, pDDELink); + pContext = new ScXMLDDERowContext(GetScImport(), xAttrList, pDDELink); break; } @@ -268,7 +261,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDETableContext::c } ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : ScXMLImportContext( rImport ), @@ -293,7 +285,6 @@ ScXMLDDEColumnContext::~ScXMLDDEColumnContext() } ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : ScXMLImportContext( rImport ), @@ -323,7 +314,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDERowContext::cre SvXMLImportContext *pContext = nullptr; if (nElement == XML_ELEMENT( TABLE, XML_TABLE_CELL )) - pContext = new ScXMLDDECellContext(GetScImport(), nElement, xAttrList, pDDELink); + pContext = new ScXMLDDECellContext(GetScImport(), xAttrList, pDDELink); if (!pContext) pContext = new SvXMLImportContext( GetImport() ); @@ -337,7 +328,6 @@ void SAL_CALL ScXMLDDERowContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : ScXMLImportContext( rImport ), diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index a08040677daf..86e6fbb5b747 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -28,8 +28,7 @@ class ScXMLDDELinksContext : public ScXMLImportContext { public: - ScXMLDDELinksContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); + ScXMLDDELinksContext( ScXMLImport& rImport); virtual ~ScXMLDDELinksContext() override; @@ -60,8 +59,7 @@ class ScXMLDDELinkContext : public ScXMLImportContext sal_uInt8 nMode; public: - ScXMLDDELinkContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); + ScXMLDDELinkContext( ScXMLImport& rImport); virtual ~ScXMLDDELinkContext() override; @@ -86,7 +84,7 @@ class ScXMLDDESourceContext : public ScXMLImportContext ScXMLDDELinkContext* pDDELink; public: - ScXMLDDESourceContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDDESourceContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -100,8 +98,7 @@ class ScXMLDDETableContext : public ScXMLImportContext ScXMLDDELinkContext* pDDELink; public: - ScXMLDDETableContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLDDETableContext( ScXMLImport& rImport, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDETableContext() override; @@ -115,7 +112,7 @@ class ScXMLDDEColumnContext : public ScXMLImportContext ScXMLDDELinkContext* pDDELink; public: - ScXMLDDEColumnContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDDEColumnContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -128,7 +125,7 @@ class ScXMLDDERowContext : public ScXMLImportContext sal_Int32 nRows; public: - ScXMLDDERowContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDDERowContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -152,7 +149,7 @@ class ScXMLDDECellContext : public ScXMLImportContext ScXMLDDELinkContext* pDDELink; public: - ScXMLDDECellContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDDECellContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index f326f605d9e0..b55738341d28 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.cxx @@ -62,7 +62,6 @@ bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp ) ScXMLDetectiveContext::ScXMLDetectiveContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ) : ScXMLImportContext( rImport ), pDetectiveObjVec( pNewDetectiveObjVec ) @@ -81,10 +80,10 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDetectiveContext:: switch (nElement) { case XML_ELEMENT( TABLE, XML_HIGHLIGHTED_RANGE ): - pContext = new ScXMLDetectiveHighlightedContext( GetScImport(), nElement, xAttrList, pDetectiveObjVec ); + pContext = new ScXMLDetectiveHighlightedContext( GetScImport(), xAttrList, pDetectiveObjVec ); break; case XML_ELEMENT( TABLE, XML_OPERATION ): - pContext = new ScXMLDetectiveOperationContext( GetScImport(), nElement, xAttrList ); + pContext = new ScXMLDetectiveOperationContext( GetScImport(), xAttrList ); break; } if( !pContext ) @@ -95,7 +94,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDetectiveContext:: ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList >& xAttrList, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ): ScXMLImportContext( rImport ), @@ -160,7 +158,6 @@ void SAL_CALL ScXMLDetectiveHighlightedContext::endFastElement( sal_Int32 /*nEle ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) : ScXMLImportContext( rImport ), aDetectiveOp(), diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 7f8a834c3e94..c3a11bdb1177 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -80,7 +80,6 @@ private: public: ScXMLDetectiveContext( ScXMLImport& rImport, - sal_Int32 nElement, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); virtual ~ScXMLDetectiveContext() override; @@ -102,7 +101,6 @@ private: public: ScXMLDetectiveHighlightedContext( ScXMLImport& rImport, - sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); @@ -120,7 +118,6 @@ private: public: ScXMLDetectiveOperationContext( ScXMLImport& rImport, - sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ); virtual ~ScXMLDetectiveOperationContext() override; diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 515619c697bf..8b3edddc997e 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -733,7 +733,7 @@ void ScXMLExportDataPilot::WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient SvXMLElementExport aElemGrandTotal(rExport, XML_NAMESPACE_TABLE_EXT, XML_DATA_PILOT_GRAND_TOTAL, true, true); } -void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreadsheetDocument>& /* xSpreadDoc */) +void ScXMLExportDataPilot::WriteDataPilots() { pDoc = rExport.GetDocument(); if (!pDoc) diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index 835924c8d0a7..48a0b8b8adce 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -67,7 +67,7 @@ class ScXMLExportDataPilot public: explicit ScXMLExportDataPilot(ScXMLExport& rExport); ~ScXMLExportDataPilot(); - void WriteDataPilots(const css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreaDoc); + void WriteDataPilots(); }; #endif diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 2c97450e5d1c..9feeb9308595 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -157,7 +157,7 @@ SvXMLImportContext *XMLTableHeaderFooterContext::CreateChildContext( xText->setString(""); //SvXMLImport aSvXMLImport( GetImport() ); uno::Reference < text::XTextCursor > xTempTextCursor(xText->createTextCursor()); - pContext = new XMLHeaderFooterRegionContext( GetImport(), nPrefix, rLocalName, xAttrList, xTempTextCursor); + pContext = new XMLHeaderFooterRegionContext( GetImport(), nPrefix, rLocalName, xTempTextCursor); } } } @@ -199,8 +199,6 @@ void XMLTableHeaderFooterContext::EndElement() XMLHeaderFooterRegionContext::XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const uno::Reference< - xml::sax::XAttributeList > & /* xAttrList */, uno::Reference< text::XTextCursor >& xCursor ) : SvXMLImportContext( rImport, nPrfx, rLName ), xTextCursor ( xCursor ) diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 0a54d0a82178..8a26a55aac0a 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -75,7 +75,6 @@ public: XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, css::uno::Reference< css::text::XTextCursor >& xCursor ); virtual ~XMLHeaderFooterRegionContext() override; diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 35ca7bace2a9..6225a7742057 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -24,9 +24,7 @@ using namespace com::sun::star; -ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */ ) : +ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport ) : ScXMLImportContext( rImport ) { // here are no attributes diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index 93d85e3a47d6..743e4e7f0c74 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -27,8 +27,7 @@ class ScXMLTableShapesContext : public ScXMLImportContext { public: - ScXMLTableShapesContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); + ScXMLTableShapesContext( ScXMLImport& rImport ); virtual ~ScXMLTableShapesContext() override; diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index 7d0c936a0346..24e2356d8e3e 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; using namespace xmloff::token; ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList) : ScXMLImportContext( rImport ), sLink(), diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 32805d92b933..1a74d00f10cd 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -35,7 +35,7 @@ class ScXMLTableSourceContext : public ScXMLImportContext css::sheet::SheetLinkMode nMode; public: - ScXMLTableSourceContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLTableSourceContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); virtual ~ScXMLTableSourceContext() override; diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index ff843fa7df51..a6cefe70e719 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -49,7 +49,7 @@ class ScXMLChangeInfoContext : public ScXMLImportContext sal_uInt32 nParagraphCount; public: - ScXMLChangeInfoContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLChangeInfoContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); @@ -65,7 +65,7 @@ class ScXMLBigRangeContext : public ScXMLImportContext ScBigRange& rBigRange; public: - ScXMLBigRangeContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLBigRangeContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScBigRange& rBigRange); @@ -91,7 +91,7 @@ class ScXMLCellContentDeletionContext : public ScXMLImportContext ScMatrixMode nMatrixFlag; public: - ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLCellContentDeletionContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); @@ -106,7 +106,7 @@ class ScXMLDependenceContext : public ScXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: - ScXMLDependenceContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDependenceContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); @@ -119,8 +119,7 @@ class ScXMLDependingsContext : public ScXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: - ScXMLDependingsContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLDependingsContext( ScXMLImport& rImport, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( @@ -132,9 +131,9 @@ class ScXMLChangeDeletionContext : public ScXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: - ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); + ScXMLChangeDeletionContext( ScXMLImport& rImport, + const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; @@ -145,9 +144,8 @@ class ScXMLDeletionsContext : public ScXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: - ScXMLDeletionsContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); + ScXMLDeletionsContext( ScXMLImport& rImport, + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; @@ -197,7 +195,7 @@ class ScXMLChangeCellContext : public ScXMLImportContext bool bFormula; public: - ScXMLChangeCellContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLChangeCellContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScCellValue& rOldCell, OUString& sAddress, OUString& rFormula, OUString& rFormulaNmsp, @@ -233,7 +231,7 @@ class ScXMLPreviousContext : public ScXMLImportContext ScMatrixMode nMatrixFlag; public: - ScXMLPreviousContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLPreviousContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); @@ -249,7 +247,7 @@ class ScXMLContentChangeContext : public ScXMLImportContext ScBigRange aBigRange; public: - ScXMLContentChangeContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLContentChangeContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); @@ -264,7 +262,7 @@ class ScXMLInsertionContext : public ScXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: - ScXMLInsertionContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLInsertionContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); @@ -310,7 +308,6 @@ class ScXMLCutOffsContext : public ScXMLImportContext public: ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, @@ -324,7 +321,7 @@ class ScXMLDeletionContext : public ScXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: - ScXMLDeletionContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDeletionContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); @@ -345,7 +342,7 @@ class ScXMLMovementContext : public ScXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: - ScXMLMovementContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLMovementContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); @@ -360,7 +357,7 @@ class ScXMLRejectionContext : public ScXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: - ScXMLRejectionContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLRejectionContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); @@ -371,7 +368,6 @@ public: }; ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), @@ -410,19 +406,19 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTrackedChangesCont switch (nElement) { case XML_ELEMENT( TABLE, XML_CELL_CONTENT_CHANGE ): - pContext = new ScXMLContentChangeContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLContentChangeContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_INSERTION ): - pContext = new ScXMLInsertionContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLInsertionContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_DELETION ): - pContext = new ScXMLDeletionContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDeletionContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_MOVEMENT ): - pContext = new ScXMLMovementContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLMovementContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_REJECTION ): - pContext = new ScXMLRejectionContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLRejectionContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; } @@ -433,7 +429,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTrackedChangesCont } ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), @@ -459,7 +454,7 @@ ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ ) { SvXMLImportContext *pContext(nullptr); @@ -467,17 +462,17 @@ SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPref { if( IsXMLToken( rLocalName, XML_CREATOR ) ) pContext = new ScXMLContentContext(GetScImport(), nPrefix, - rLocalName, xAttrList, sAuthorBuffer); + rLocalName, sAuthorBuffer); else if( IsXMLToken( rLocalName, XML_DATE ) ) pContext = new ScXMLContentContext(GetScImport(), nPrefix, - rLocalName, xAttrList, sDateTimeBuffer); + rLocalName, sDateTimeBuffer); } else if ((nPrefix == XML_NAMESPACE_TEXT) && (IsXMLToken(rLocalName, XML_P)) ) { if(nParagraphCount) sCommentBuffer.append('\n'); ++nParagraphCount; - pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLocalName, xAttrList, sCommentBuffer); + pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLocalName, sCommentBuffer); } if( !pContext ) @@ -496,7 +491,6 @@ void SAL_CALL ScXMLChangeInfoContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScBigRange& rTempBigRange ) : ScXMLImportContext( rImport ), @@ -574,7 +568,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLBigRangeContext::c } ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper) : ScXMLImportContext( rImport ), @@ -606,12 +599,12 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLCellContentDeletio switch (nElement) { case XML_ELEMENT( TABLE, XML_CHANGE_TRACK_TABLE_CELL ): - pContext = new ScXMLChangeCellContext(GetScImport(), nElement, xAttrList, + pContext = new ScXMLChangeCellContext(GetScImport(), xAttrList, maCell, sFormulaAddress, sFormula, sFormulaNmsp, eGrammar, sInputString, fValue, nType, nMatrixFlag, nMatrixCols, nMatrixRows ); break; case XML_ELEMENT( TABLE, XML_CELL_ADDRESS ): OSL_ENSURE(!nID, "a action with a ID should not contain a BigRange"); - pContext = new ScXMLBigRangeContext(GetScImport(), nElement, xAttrList, aBigRange); + pContext = new ScXMLBigRangeContext(GetScImport(), xAttrList, aBigRange); break; } @@ -632,7 +625,6 @@ void SAL_CALL ScXMLCellContentDeletionContext::endFastElement( sal_Int32 /*nElem } ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), @@ -658,8 +650,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDependenceContext: } ScXMLDependingsContext::ScXMLDependingsContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const uno::Reference<xml::sax::XFastAttributeList>& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), pChangeTrackingImportHelper(pTempChangeTrackingImportHelper) @@ -676,7 +666,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDependingsContext: if (nElement == XML_ELEMENT( TABLE, XML_DEPENDENCE ) || nElement == XML_ELEMENT( TABLE, XML_DEPENDENCY )) { - pContext = new ScXMLDependenceContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDependenceContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); } if( !pContext ) @@ -686,7 +676,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDependingsContext: } ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), @@ -712,8 +701,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLChangeDeletionCont } ScXMLDeletionsContext::ScXMLDeletionsContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const uno::Reference<xml::sax::XFastAttributeList>& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), pChangeTrackingImportHelper(pTempChangeTrackingImportHelper) @@ -729,10 +716,10 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDeletionsContext:: switch (nElement) { case XML_ELEMENT( TABLE, XML_CHANGE_DELETION ): - pContext = new ScXMLChangeDeletionContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLChangeDeletionContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_CELL_CONTENT_DELETION ): - pContext = new ScXMLCellContentDeletionContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLCellContentDeletionContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; } @@ -824,7 +811,6 @@ void ScXMLChangeTextPContext::EndElement() } ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScCellValue& rOldCell, OUString& rAddress, OUString& rFormula, OUString& rFormulaNmsp, @@ -1010,7 +996,6 @@ void SAL_CALL ScXMLChangeCellContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), @@ -1040,7 +1025,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLPreviousContext::c SvXMLImportContext *pContext(nullptr); if ( nElement == XML_ELEMENT( TABLE, XML_CHANGE_TRACK_TABLE_CELL ) ) - pContext = new ScXMLChangeCellContext(GetScImport(), nElement, xAttrList, + pContext = new ScXMLChangeCellContext(GetScImport(), xAttrList, maOldCell, sFormulaAddress, sFormula, sFormulaNmsp, eGrammar, sInputString, fValue, nType, nMatrixFlag, nMatrixCols, nMatrixRows); if( !pContext ) @@ -1056,7 +1041,6 @@ void SAL_CALL ScXMLPreviousContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLContentChangeContext::ScXMLContentChangeContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), @@ -1104,19 +1088,19 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLContentChangeConte switch (nElement) { case XML_ELEMENT( OFFICE, XML_CHANGE_INFO ): - pContext = new ScXMLChangeInfoContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLChangeInfoContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_CELL_ADDRESS ): - pContext = new ScXMLBigRangeContext(GetScImport(), nElement, xAttrList, aBigRange); + pContext = new ScXMLBigRangeContext(GetScImport(), xAttrList, aBigRange); break; case XML_ELEMENT( TABLE, XML_DEPENDENCIES ): - pContext = new ScXMLDependingsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDependingsContext(GetScImport(), pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_DELETIONS ): - pContext = new ScXMLDeletionsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDeletionsContext(GetScImport(), pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_PREVIOUS ): - pContext = new ScXMLPreviousContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLPreviousContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; } @@ -1133,7 +1117,6 @@ void SAL_CALL ScXMLContentChangeContext::endFastElement( sal_Int32 /*nElement*/ } ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), @@ -1202,13 +1185,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLInsertionContext:: switch (nElement) { case XML_ELEMENT( OFFICE, XML_CHANGE_INFO ): - pContext = new ScXMLChangeInfoContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLChangeInfoContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_DEPENDENCIES ): - pContext = new ScXMLDependingsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDependingsContext(GetScImport(), pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_DELETIONS ): - pContext = new ScXMLDeletionsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDeletionsContext(GetScImport(), pChangeTrackingImportHelper); break; } @@ -1328,10 +1311,9 @@ void ScXMLMovementCutOffContext::EndElement() } ScXMLCutOffsContext::ScXMLCutOffsContext( ScXMLImport& rImport, - sal_uInt16 nPrfx, - const OUString& rLName, - const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */, - ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : + sal_uInt16 nPrfx, + const OUString& rLName, + ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport, nPrfx, rLName ), pChangeTrackingImportHelper(pTempChangeTrackingImportHelper) { @@ -1363,7 +1345,6 @@ void ScXMLCutOffsContext::EndElement() } ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), @@ -1428,14 +1409,14 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport, SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ ) { SvXMLImportContext *pContext(nullptr); if (nPrefix == XML_NAMESPACE_TABLE) { if (IsXMLToken(rLocalName, XML_CUT_OFFS) || rLocalName == "cut_offs") - pContext = new ScXMLCutOffsContext(GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLCutOffsContext(GetScImport(), nPrefix, rLocalName, pChangeTrackingImportHelper); else { OSL_FAIL("don't know this"); @@ -1456,13 +1437,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDeletionContext::c switch (nElement) { case XML_ELEMENT( OFFICE, XML_CHANGE_INFO ): - pContext = new ScXMLChangeInfoContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLChangeInfoContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_DEPENDENCIES ): - pContext = new ScXMLDependingsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDependingsContext(GetScImport(), pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_DELETIONS ): - pContext = new ScXMLDeletionsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDeletionsContext(GetScImport(), pChangeTrackingImportHelper); break; } @@ -1478,7 +1459,6 @@ void SAL_CALL ScXMLDeletionContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), @@ -1527,19 +1507,19 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLMovementContext::c switch (nElement) { case XML_ELEMENT( OFFICE, XML_CHANGE_INFO ): - pContext = new ScXMLChangeInfoContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLChangeInfoContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_DEPENDENCIES ): - pContext = new ScXMLDependingsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDependingsContext(GetScImport(), pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_DELETIONS ): - pContext = new ScXMLDeletionsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDeletionsContext(GetScImport(), pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_SOURCE_RANGE_ADDRESS ): - pContext = new ScXMLBigRangeContext(GetScImport(), nElement, xAttrList, aSourceRange); + pContext = new ScXMLBigRangeContext(GetScImport(), xAttrList, aSourceRange); break; case XML_ELEMENT( TABLE, XML_TARGET_RANGE_ADDRESS ): - pContext = new ScXMLBigRangeContext(GetScImport(), nElement, xAttrList, aTargetRange); + pContext = new ScXMLBigRangeContext(GetScImport(), xAttrList, aTargetRange); break; } @@ -1556,7 +1536,6 @@ void SAL_CALL ScXMLMovementContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : ScXMLImportContext( rImport ), @@ -1605,13 +1584,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLRejectionContext:: switch (nElement) { case XML_ELEMENT( OFFICE, XML_CHANGE_INFO ): - pContext = new ScXMLChangeInfoContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLChangeInfoContext(GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_DEPENDENCIES ): - pContext = new ScXMLDependingsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDependingsContext(GetScImport(), pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_DELETIONS ): - pContext = new ScXMLDeletionsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLDeletionsContext(GetScImport(), pChangeTrackingImportHelper); break; } diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 5d12000a295f..fe0d5f8a12c6 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -34,7 +34,7 @@ class ScXMLTrackedChangesContext : public ScXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: - ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLTrackedChangesContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLTrackedChangesContext() override; diff --git a/sc/source/filter/xml/celltextparacontext.cxx b/sc/source/filter/xml/celltextparacontext.cxx index ea4349011fae..17d391fc4523 100644 --- a/sc/source/filter/xml/celltextparacontext.cxx +++ b/sc/source/filter/xml/celltextparacontext.cxx @@ -21,7 +21,7 @@ using namespace com::sun::star; using namespace xmloff::token; ScXMLCellTextParaContext::ScXMLCellTextParaContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLTableRowCellContext& rParent) : + ScXMLImport& rImport, ScXMLTableRowCellContext& rParent) : ScXMLImportContext(rImport), mrParentCxt(rParent) { @@ -52,17 +52,17 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLCellTextParaContex switch (nElement) { case XML_ELEMENT( TEXT, XML_S ): - return new ScXMLCellFieldSContext(GetScImport(), nElement, *this); + return new ScXMLCellFieldSContext(GetScImport(), *this); case XML_ELEMENT( TEXT, XML_SPAN ): - return new ScXMLCellTextSpanContext(GetScImport(), nElement, *this); + return new ScXMLCellTextSpanContext(GetScImport(), *this); case XML_ELEMENT( TEXT, XML_SHEET_NAME ): - return new ScXMLCellFieldSheetNameContext(GetScImport(), nElement, *this); + return new ScXMLCellFieldSheetNameContext(GetScImport(), *this); case XML_ELEMENT( TEXT, XML_DATE ): - return new ScXMLCellFieldDateContext(GetScImport(), nElement, *this); + return new ScXMLCellFieldDateContext(GetScImport(), *this); case XML_ELEMENT( TEXT, XML_TITLE ): - return new ScXMLCellFieldTitleContext(GetScImport(), nElement, *this); + return new ScXMLCellFieldTitleContext(GetScImport(), *this); case XML_ELEMENT( TEXT, XML_A ): - return new ScXMLCellFieldURLContext(GetScImport(), nElement, *this); + return new ScXMLCellFieldURLContext(GetScImport(), *this); default: ; } @@ -97,7 +97,7 @@ void ScXMLCellTextParaContext::PushFieldURL( } ScXMLCellTextSpanContext::ScXMLCellTextSpanContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) : + ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) : ScXMLImportContext(rImport), mrParentCxt(rParent) { @@ -151,31 +151,31 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLCellTextSpanContex { case XML_ELEMENT( TEXT, XML_SHEET_NAME ): { - ScXMLCellFieldSheetNameContext* p = new ScXMLCellFieldSheetNameContext(GetScImport(), nElement, mrParentCxt); + ScXMLCellFieldSheetNameContext* p = new ScXMLCellFieldSheetNameContext(GetScImport(), mrParentCxt); p->SetStyleName(maStyleName); return p; } case XML_ELEMENT( TEXT, XML_DATE ): { - ScXMLCellFieldDateContext* p = new ScXMLCellFieldDateContext(GetScImport(), nElement, mrParentCxt); + ScXMLCellFieldDateContext* p = new ScXMLCellFieldDateContext(GetScImport(), mrParentCxt); p->SetStyleName(maStyleName); return p; } case XML_ELEMENT( TEXT, XML_TITLE ): { - ScXMLCellFieldTitleContext* p = new ScXMLCellFieldTitleContext(GetScImport(), nElement, mrParentCxt); + ScXMLCellFieldTitleContext* p = new ScXMLCellFieldTitleContext(GetScImport(), mrParentCxt); p->SetStyleName(maStyleName); return p; } case XML_ELEMENT( TEXT, XML_A ): { - ScXMLCellFieldURLContext* p = new ScXMLCellFieldURLContext(GetScImport(), nElement, mrParentCxt); + ScXMLCellFieldURLContext* p = new ScXMLCellFieldURLContext(GetScImport(), mrParentCxt); p->SetStyleName(maStyleName); return p; } case XML_ELEMENT( TEXT, XML_S ): { - ScXMLCellFieldSContext* p = new ScXMLCellFieldSContext(GetScImport(), nElement, mrParentCxt); + ScXMLCellFieldSContext* p = new ScXMLCellFieldSContext(GetScImport(), mrParentCxt); p->SetStyleName(maStyleName); return p; } @@ -187,7 +187,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLCellTextSpanContex } ScXMLCellFieldSheetNameContext::ScXMLCellFieldSheetNameContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) : + ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) : ScXMLImportContext(rImport), mrParentCxt(rParent) { @@ -210,7 +210,7 @@ void SAL_CALL ScXMLCellFieldSheetNameContext::endFastElement( sal_Int32 /*nEleme } ScXMLCellFieldDateContext::ScXMLCellFieldDateContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) : + ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) : ScXMLImportContext(rImport), mrParentCxt(rParent) { @@ -227,7 +227,7 @@ void SAL_CALL ScXMLCellFieldDateContext::endFastElement( sal_Int32 /*nElement*/ } ScXMLCellFieldTitleContext::ScXMLCellFieldTitleContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) : + ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) : ScXMLImportContext(rImport), mrParentCxt(rParent) { @@ -244,7 +244,7 @@ void SAL_CALL ScXMLCellFieldTitleContext::endFastElement( sal_Int32 /*nElement*/ } ScXMLCellFieldURLContext::ScXMLCellFieldURLContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) : + ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) : ScXMLImportContext(rImport), mrParentCxt(rParent) { @@ -294,7 +294,7 @@ void SAL_CALL ScXMLCellFieldURLContext::characters( const OUString& rChars ) } ScXMLCellFieldSContext::ScXMLCellFieldSContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) : + ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) : ScXMLImportContext(rImport), mrParentCxt(rParent), mnCount(1) diff --git a/sc/source/filter/xml/celltextparacontext.hxx b/sc/source/filter/xml/celltextparacontext.hxx index fed9ac9dab54..3d62077c329e 100644 --- a/sc/source/filter/xml/celltextparacontext.hxx +++ b/sc/source/filter/xml/celltextparacontext.hxx @@ -23,7 +23,7 @@ class ScXMLCellTextParaContext : public ScXMLImportContext ScXMLTableRowCellContext& mrParentCxt; OUString maContent; public: - ScXMLCellTextParaContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLTableRowCellContext& rParent); + ScXMLCellTextParaContext(ScXMLImport& rImport, ScXMLTableRowCellContext& rParent); virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override; virtual void SAL_CALL characters( const OUString& aChars ) override; @@ -46,7 +46,7 @@ class ScXMLCellTextSpanContext : public ScXMLImportContext OUString maStyleName; OUString maContent; public: - ScXMLCellTextSpanContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent); + ScXMLCellTextSpanContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent); virtual void SAL_CALL startFastElement( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; @@ -64,7 +64,7 @@ class ScXMLCellFieldSheetNameContext : public ScXMLImportContext ScXMLCellTextParaContext& mrParentCxt; OUString maStyleName; public: - ScXMLCellFieldSheetNameContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent); + ScXMLCellFieldSheetNameContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent); void SetStyleName(const OUString& rStyleName); @@ -81,7 +81,7 @@ class ScXMLCellFieldDateContext : public ScXMLImportContext ScXMLCellTextParaContext& mrParentCxt; OUString maStyleName; public: - ScXMLCellFieldDateContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent); + ScXMLCellFieldDateContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent); void SetStyleName(const OUString& rStyleName); @@ -96,7 +96,7 @@ class ScXMLCellFieldTitleContext : public ScXMLImportContext ScXMLCellTextParaContext& mrParentCxt; OUString maStyleName; public: - ScXMLCellFieldTitleContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent); + ScXMLCellFieldTitleContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent); void SetStyleName(const OUString& rStyleName); @@ -114,7 +114,7 @@ class ScXMLCellFieldURLContext : public ScXMLImportContext OUString maRep; OUString maTargetFrame; public: - ScXMLCellFieldURLContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent); + ScXMLCellFieldURLContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent); void SetStyleName(const OUString& rStyleName); @@ -135,7 +135,7 @@ class ScXMLCellFieldSContext : public ScXMLImportContext void PushSpaces(); public: - ScXMLCellFieldSContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent); + ScXMLCellFieldSContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent); void SetStyleName(const OUString& rStyleName); diff --git a/sc/source/filter/xml/datastreamimport.cxx b/sc/source/filter/xml/datastreamimport.cxx index 156ee52e02bd..f6d2428ceea3 100644 --- a/sc/source/filter/xml/datastreamimport.cxx +++ b/sc/source/filter/xml/datastreamimport.cxx @@ -21,7 +21,7 @@ using namespace com::sun::star; using namespace xmloff::token; ScXMLDataStreamContext::ScXMLDataStreamContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, + ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList ) : ScXMLImportContext(rImport), mbRefreshOnEmpty(false), diff --git a/sc/source/filter/xml/datastreamimport.hxx b/sc/source/filter/xml/datastreamimport.hxx index 91980ea2f4f0..6e174db07177 100644 --- a/sc/source/filter/xml/datastreamimport.hxx +++ b/sc/source/filter/xml/datastreamimport.hxx @@ -24,7 +24,7 @@ class ScXMLDataStreamContext : public ScXMLImportContext public: ScXMLDataStreamContext( - ScXMLImport& rImport, sal_Int32 nElement, + ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList ); virtual ~ScXMLDataStreamContext() override; diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index 5abb51937c4f..f88643686540 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -124,16 +124,16 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPref { if( IsXMLToken( rLName, XML_CREATOR ) ) pContext = new ScXMLContentContext(GetScImport(), nPrefix, - rLName, xAttrList, maAuthorBuffer); + rLName, maAuthorBuffer); else if( IsXMLToken( rLName, XML_DATE ) ) pContext = new ScXMLContentContext(GetScImport(), nPrefix, - rLName, xAttrList, maCreateDateBuffer); + rLName, maCreateDateBuffer); } else if( XML_NAMESPACE_META == nPrefix ) { if( IsXMLToken( rLName, XML_DATE_STRING ) ) pContext = new ScXMLContentContext(GetScImport(), nPrefix, - rLName, xAttrList, maCreateDateStringBuffer); + rLName, maCreateDateStringBuffer); } if( !pContext && pShapeContext ) diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 159c25a2e023..e560028ccd79 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -141,17 +141,17 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL case XML_ELEMENT( TABLE, XML_TRACKED_CHANGES ): pChangeTrackingImportHelper = GetScImport().GetChangeTrackingImportHelper(); if (pChangeTrackingImportHelper) - pContext = new ScXMLTrackedChangesContext( GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper); + pContext = new ScXMLTrackedChangesContext( GetScImport(), xAttrList, pChangeTrackingImportHelper); break; case XML_ELEMENT( TABLE, XML_CALCULATION_SETTINGS ): - pContext = new ScXMLCalculationSettingsContext( GetScImport(), nElement, xAttrList ); + pContext = new ScXMLCalculationSettingsContext( GetScImport(), xAttrList ); bHadCalculationSettings = true; break; case XML_ELEMENT( TABLE, XML_CONTENT_VALIDATIONS ): - pContext = new ScXMLContentValidationsContext( GetScImport(), nElement, xAttrList ); + pContext = new ScXMLContentValidationsContext( GetScImport() ); break; case XML_ELEMENT( TABLE, XML_LABEL_RANGES ): - pContext = new ScXMLLabelRangesContext( GetScImport(), nElement, xAttrList ); + pContext = new ScXMLLabelRangesContext( GetScImport() ); break; case XML_ELEMENT( TABLE, XML_TABLE ): if (GetScImport().GetTables().GetCurrentSheet() >= MAXTAB) @@ -166,35 +166,30 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL break; case XML_ELEMENT( TABLE, XML_NAMED_EXPRESSIONS ): pContext = new ScXMLNamedExpressionsContext ( - GetScImport(), nElement, xAttrList, + GetScImport(), new ScXMLNamedExpressionsContext::GlobalInserter(GetScImport()) ); break; case XML_ELEMENT( TABLE, XML_DATABASE_RANGES ): - pContext = new ScXMLDatabaseRangesContext ( GetScImport(), nElement, - xAttrList ); + pContext = new ScXMLDatabaseRangesContext ( GetScImport() ); break; case XML_ELEMENT( CALC_EXT, XML_DATA_MAPPINGS ): - pContext = new ScXMLMappingsContext(GetScImport(), nElement, - xAttrList); + pContext = new ScXMLMappingsContext(GetScImport()); break; case XML_ELEMENT( TABLE, XML_DATABASE_RANGE ): - pContext = new ScXMLDatabaseRangeContext ( GetScImport(), nElement, + pContext = new ScXMLDatabaseRangeContext ( GetScImport(), xAttrList ); break; case XML_ELEMENT( TABLE, XML_DATA_PILOT_TABLES ): - pContext = new ScXMLDataPilotTablesContext ( GetScImport(), nElement, - xAttrList ); + pContext = new ScXMLDataPilotTablesContext ( GetScImport() ); break; case XML_ELEMENT( TABLE, XML_CONSOLIDATION ): - pContext = new ScXMLConsolidationContext ( GetScImport(), nElement, - xAttrList ); + pContext = new ScXMLConsolidationContext ( GetScImport(), xAttrList ); break; case XML_ELEMENT( TABLE, XML_DDE_LINKS ): - pContext = new ScXMLDDELinksContext ( GetScImport(), nElement, - xAttrList ); + pContext = new ScXMLDDELinksContext ( GetScImport() ); break; case XML_ELEMENT( CALC_EXT, XML_DATA_STREAM_SOURCE ): - pContext = new ScXMLDataStreamContext(GetScImport(), nElement, xAttrList); + pContext = new ScXMLDataStreamContext(GetScImport(), xAttrList); break; } @@ -237,7 +232,7 @@ void SAL_CALL ScXMLBodyContext::endFastElement(sal_Int32 nElement) if (!bHadCalculationSettings) { // #111055#; set calculation settings defaults if there is no calculation settings element - rtl::Reference<ScXMLCalculationSettingsContext> pContext( new ScXMLCalculationSettingsContext(GetScImport(), nElement, nullptr) ); + rtl::Reference<ScXMLCalculationSettingsContext> pContext( new ScXMLCalculationSettingsContext(GetScImport(), nullptr) ); pContext->endFastElement( nElement ); } diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 9de47677dd1a..b7595ea9c614 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -711,7 +711,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTableRowCellContex bIsEmpty = false; // bTextP = true; - pContext = new ScXMLCellTextParaContext(rXMLImport, nElement, *this); + pContext = new ScXMLCellTextParaContext(rXMLImport, *this); } break; case XML_ELEMENT( TABLE, XML_SUB_TABLE ): @@ -725,7 +725,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTableRowCellContex if (!pDetectiveObjVec) pDetectiveObjVec = new ScMyImpDetectiveObjVec; pContext = new ScXMLDetectiveContext( - rXMLImport, nElement, pDetectiveObjVec ); + rXMLImport, pDetectiveObjVec ); } break; case XML_ELEMENT( TABLE, XML_CELL_RANGE_SOURCE ): @@ -734,7 +734,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTableRowCellContex if (!pCellRangeSource) pCellRangeSource = new ScMyImpCellRangeSource(); pContext = new ScXMLCellRangeSourceContext( - rXMLImport, nElement, xAttrList, pCellRangeSource ); + rXMLImport, xAttrList, pCellRangeSource ); } break; } diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index ac61900a426b..3593b48976cf 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star; using namespace xmloff::token; ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) : ScXMLImportContext( rImport ), sVisibility(GetXMLToken(XML_VISIBLE)) @@ -147,7 +146,6 @@ void SAL_CALL ScXMLTableColContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, const bool bTempHeader, const bool bTempGroup) : ScXMLImportContext( rImport ), @@ -189,21 +187,19 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTableColsContext:: switch (nElement) { case XML_ELEMENT( TABLE, XML_TABLE_COLUMN_GROUP ): - pContext = new ScXMLTableColsContext( GetScImport(), nElement, xAttrList, + pContext = new ScXMLTableColsContext( GetScImport(), xAttrList, false, true ); break; case XML_ELEMENT( TABLE, XML_TABLE_HEADER_COLUMNS ): - pContext = new ScXMLTableColsContext( GetScImport(), nElement, xAttrList, + pContext = new ScXMLTableColsContext( GetScImport(), xAttrList, true, false ); break; case XML_ELEMENT( TABLE, XML_TABLE_COLUMNS ): - pContext = new ScXMLTableColsContext( GetScImport(), nElement, xAttrList, + pContext = new ScXMLTableColsContext( GetScImport(), xAttrList, false, false ); break; case XML_ELEMENT( TABLE, XML_TABLE_COLUMN ): - pContext = new ScXMLTableColContext( GetScImport(), nElement, xAttrList//, - //this - ); + pContext = new ScXMLTableColContext( GetScImport(), xAttrList ); break; } diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 9b7d2a2a9378..3c33dd706116 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -33,7 +33,7 @@ class ScXMLTableColContext : public ScXMLImportContext public: - ScXMLTableColContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLTableColContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ); virtual ~ScXMLTableColContext() override; @@ -56,7 +56,7 @@ class ScXMLTableColsContext : public ScXMLImportContext public: - ScXMLTableColsContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLTableColsContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, const bool bHeader, const bool bGroup); diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 04411dc529e6..e2f79aa6c94b 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -24,7 +24,7 @@ using namespace xmloff::token; -ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_Int32 /*nElement*/ ): +ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rImport ): ScXMLImportContext( rImport ) { GetScImport().SetNewCondFormatData(); @@ -38,7 +38,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLConditio switch (nElement) { case XML_ELEMENT( CALC_EXT, XML_CONDITIONAL_FORMAT ): - pContext = new ScXMLConditionalFormatContext( GetScImport(), nElement, xAttrList ); + pContext = new ScXMLConditionalFormatContext( GetScImport(), xAttrList ); break; } @@ -56,7 +56,7 @@ void SAL_CALL ScXMLConditionalFormatsContext::endFastElement( sal_Int32 /*nEleme SAL_WARN_IF(bDeleted, "sc", "conditional formats have been deleted because they contained empty range info"); } -ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList): ScXMLImportContext( rImport ) { @@ -94,19 +94,19 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLConditio switch (nElement) { case XML_ELEMENT( CALC_EXT, XML_CONDITION ): - pContext = new ScXMLCondContext( GetScImport(), nElement, xAttrList, mxFormat.get() ); + pContext = new ScXMLCondContext( GetScImport(), xAttrList, mxFormat.get() ); break; case XML_ELEMENT( CALC_EXT, XML_COLOR_SCALE ): - pContext = new ScXMLColorScaleFormatContext( GetScImport(), nElement, mxFormat.get() ); + pContext = new ScXMLColorScaleFormatContext( GetScImport(), mxFormat.get() ); break; case XML_ELEMENT( CALC_EXT, XML_DATA_BAR ): - pContext = new ScXMLDataBarFormatContext( GetScImport(), nElement, xAttrList, mxFormat.get() ); + pContext = new ScXMLDataBarFormatContext( GetScImport(), xAttrList, mxFormat.get() ); break; case XML_ELEMENT( CALC_EXT, XML_ICON_SET ): - pContext = new ScXMLIconSetFormatContext( GetScImport(), nElement, xAttrList, mxFormat.get() ); + pContext = new ScXMLIconSetFormatContext( GetScImport(), xAttrList, mxFormat.get() ); break; case XML_ELEMENT( CALC_EXT, XML_DATE_IS ): - pContext = new ScXMLDateContext( GetScImport(), nElement, xAttrList, mxFormat.get() ); + pContext = new ScXMLDateContext( GetScImport(), xAttrList, mxFormat.get() ); break; default: break; @@ -131,7 +131,7 @@ ScXMLConditionalFormatContext::~ScXMLConditionalFormatContext() { } -ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport, ScConditionalFormat* pFormat): ScXMLImportContext( rImport ), pColorScaleFormat(nullptr) @@ -147,7 +147,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLColorSca switch (nElement) { case XML_ELEMENT( CALC_EXT, XML_COLOR_SCALE_ENTRY ): - pContext = new ScXMLColorScaleFormatEntryContext( GetScImport(), nElement, xAttrList, pColorScaleFormat ); + pContext = new ScXMLColorScaleFormatEntryContext( GetScImport(), xAttrList, pColorScaleFormat ); break; default: break; @@ -156,7 +156,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLColorSca return pContext; } -ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScConditionalFormat* pFormat): ScXMLImportContext( rImport ), @@ -288,7 +288,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLDataBarF case XML_ELEMENT( CALC_EXT, XML_DATA_BAR_ENTRY ): { ScColorScaleEntry* pEntry(nullptr); - pContext = new ScXMLFormattingEntryContext( GetScImport(), nElement, xAttrList, pEntry ); + pContext = new ScXMLFormattingEntryContext( GetScImport(), xAttrList, pEntry ); if(mnIndex == 0) { mpFormatData->mpLowerLimit.reset(pEntry); @@ -312,7 +312,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLDataBarF return pContext; } -ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScConditionalFormat* pFormat): ScXMLImportContext( rImport ) @@ -377,7 +377,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLIconSetF case XML_ELEMENT( CALC_EXT, XML_FORMATTING_ENTRY ): { ScColorScaleEntry* pEntry(nullptr); - pContext = new ScXMLFormattingEntryContext( GetScImport(), nElement, xAttrList, pEntry ); + pContext = new ScXMLFormattingEntryContext( GetScImport(), xAttrList, pEntry ); mpFormatData->m_Entries.push_back(std::unique_ptr<ScColorScaleEntry>(pEntry)); } break; @@ -550,7 +550,7 @@ void GetConditionData(const OUString& rValue, ScConditionMode& eMode, OUString& } -ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScConditionalFormat* pFormat ): ScXMLImportContext( rImport ) @@ -622,7 +622,7 @@ void setColorEntryType(const OUString& rType, ScColorScaleEntry* pEntry, const O } -ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScColorScaleFormat* pFormat): ScXMLImportContext( rImport ), @@ -671,7 +671,7 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor pFormat->AddEntry(mpFormatEntry); } -ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScColorScaleEntry*& pColorScaleEntry): ScXMLImportContext( rImport ) @@ -745,7 +745,7 @@ condformat::ScCondFormatDateType getDateFromString(const OUString& rString) } -ScXMLDateContext::ScXMLDateContext( ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLDateContext::ScXMLDateContext( ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScConditionalFormat* pFormat ): ScXMLImportContext( rImport ) diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 81bf6133adb0..ac3c9267eefb 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -26,7 +26,7 @@ struct ScIconSetFormatData; class ScXMLConditionalFormatsContext : public ScXMLImportContext { public: - ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_Int32 nElement ); + ScXMLConditionalFormatsContext( ScXMLImport& rImport ); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; @@ -37,7 +37,7 @@ public: class ScXMLConditionalFormatContext : public ScXMLImportContext { public: - ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLConditionalFormatContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); virtual ~ScXMLConditionalFormatContext() override; @@ -55,7 +55,7 @@ private: class ScXMLColorScaleFormatContext : public ScXMLImportContext { public: - ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLColorScaleFormatContext( ScXMLImport& rImport, ScConditionalFormat* pFormat); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( @@ -68,7 +68,7 @@ private: class ScXMLDataBarFormatContext : public ScXMLImportContext { public: - ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataBarFormatContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -87,7 +87,7 @@ class ScXMLIconSetFormatContext : public ScXMLImportContext ScIconSetFormatData* mpFormatData; public: - ScXMLIconSetFormatContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLIconSetFormatContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -98,7 +98,7 @@ public: class ScXMLColorScaleFormatEntryContext : public ScXMLImportContext { public: - ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScColorScaleFormat* pFormat); @@ -109,7 +109,7 @@ private: class ScXMLFormattingEntryContext : public ScXMLImportContext { public: - ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLFormattingEntryContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScColorScaleEntry*& pData); }; @@ -117,7 +117,7 @@ public: class ScXMLCondContext : public ScXMLImportContext { public: - ScXMLCondContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLCondContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScConditionalFormat* pFormat); }; @@ -125,7 +125,7 @@ public: class ScXMLDateContext : public ScXMLImportContext { public: - ScXMLDateContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDateContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScConditionalFormat* pFormat); }; diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index 1fa59c66ffb1..5d139567080d 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -32,7 +32,6 @@ using namespace xmloff::token; ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, OUStringBuffer& sTempValue) : ScXMLImportContext( rImport, nPrfx, rLName ), sOUText(), diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index 0daa587dc51a..fd5a39a0dd0c 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -33,8 +33,7 @@ public: ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, - OUStringBuffer& sValue); + OUStringBuffer& sValue); virtual ~ScXMLContentContext() override; diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 71e2b5f08eab..abc621927e3e 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -58,7 +58,7 @@ class ScXMLContentValidationContext : public ScXMLImportContext public: - ScXMLContentValidationContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLContentValidationContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, @@ -86,7 +86,7 @@ class ScXMLHelpMessageContext : public ScXMLImportContext public: - ScXMLHelpMessageContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLHelpMessageContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -109,7 +109,7 @@ class ScXMLErrorMessageContext : public ScXMLImportContext public: - ScXMLErrorMessageContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLErrorMessageContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -128,7 +128,7 @@ class ScXMLErrorMacroContext : public ScXMLImportContext public: - ScXMLErrorMacroContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLErrorMacroContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -138,9 +138,7 @@ public: virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override; }; -ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */ ) : +ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport ) : ScXMLImportContext( rImport ) { // here are no attributes @@ -158,7 +156,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLContentValidations switch (nElement) { case XML_ELEMENT( TABLE, XML_CONTENT_VALIDATION ): - pContext = new ScXMLContentValidationContext( GetScImport(), nElement, xAttrList); + pContext = new ScXMLContentValidationContext( GetScImport(), xAttrList); break; } @@ -169,7 +167,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLContentValidations } ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList) : ScXMLImportContext( rImport ), nShowList(sheet::TableValidationVisibility::UNSORTED), @@ -252,13 +249,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLContentValidationC switch (nElement) { case XML_ELEMENT( TABLE, XML_HELP_MESSAGE ): - pContext = new ScXMLHelpMessageContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLHelpMessageContext( GetScImport(), xAttrList, this); break; case XML_ELEMENT( TABLE, XML_ERROR_MESSAGE ): - pContext = new ScXMLErrorMessageContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLErrorMessageContext( GetScImport(), xAttrList, this); break; case XML_ELEMENT( TABLE, XML_ERROR_MACRO ): - pContext = new ScXMLErrorMacroContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLErrorMacroContext( GetScImport(), xAttrList, this); break; } @@ -443,7 +440,6 @@ void ScXMLContentValidationContext::SetErrorMacro(const bool bExecute) } ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : ScXMLImportContext( rImport ), @@ -475,7 +471,7 @@ ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport, SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ ) { SvXMLImportContext *pContext = nullptr; @@ -487,7 +483,7 @@ SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPre if(nParagraphCount) sMessage.append('\n'); ++nParagraphCount; - pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLName, xAttrList, sMessage); + pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLName, sMessage); } break; } @@ -504,7 +500,6 @@ void SAL_CALL ScXMLHelpMessageContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : ScXMLImportContext( rImport ), @@ -540,7 +535,7 @@ ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport, SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ ) { SvXMLImportContext *pContext = nullptr; @@ -552,7 +547,7 @@ SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPr if(nParagraphCount) sMessage.append('\n'); ++nParagraphCount; - pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLName, xAttrList, sMessage); + pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLName, sMessage); } break; } @@ -569,7 +564,6 @@ void SAL_CALL ScXMLErrorMessageContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : ScXMLImportContext( rImport ), diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index f633e96ca933..0722f019975b 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -32,8 +32,7 @@ class ScXMLContentValidationsContext : public ScXMLImportContext { public: - ScXMLContentValidationsContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); + ScXMLContentValidationsContext( ScXMLImport& rImport ); virtual ~ScXMLContentValidationsContext() override; diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 7a00a7809b1a..7bc8a7f54146 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -55,9 +55,7 @@ using namespace xmloff::token; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; -ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */ ) : +ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport ) : ScXMLImportContext( rImport ) { // has no Attributes @@ -78,7 +76,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotTablesCon { case XML_ELEMENT( TABLE, XML_DATA_PILOT_TABLE ) : { - pContext = new ScXMLDataPilotTableContext( GetScImport(), nElement, xAttrList); + pContext = new ScXMLDataPilotTableContext( GetScImport(), xAttrList); } break; } @@ -93,7 +91,6 @@ ScXMLDataPilotTableContext::GrandTotalItem::GrandTotalItem() : mbVisible(true) {} ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList) : ScXMLImportContext( rImport ), pDoc(GetScImport().GetDocument()), @@ -216,42 +213,42 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotTableCont { case XML_ELEMENT( TABLE, XML_DATABASE_SOURCE_SQL ): { - pContext = new ScXMLDPSourceSQLContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDPSourceSQLContext(GetScImport(), xAttrList, this); nSourceType = SQL; } break; case XML_ELEMENT( TABLE, XML_DATABASE_SOURCE_TABLE ): { - pContext = new ScXMLDPSourceTableContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDPSourceTableContext(GetScImport(), xAttrList, this); nSourceType = TABLE; } break; case XML_ELEMENT( TABLE, XML_DATABASE_SOURCE_QUERY ): { - pContext = new ScXMLDPSourceQueryContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDPSourceQueryContext(GetScImport(), xAttrList, this); nSourceType = QUERY; } break; case XML_ELEMENT( TABLE, XML_SOURCE_SERVICE ): { - pContext = new ScXMLSourceServiceContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLSourceServiceContext(GetScImport(), xAttrList, this); nSourceType = SERVICE; } break; case XML_ELEMENT( TABLE, XML_DATA_PILOT_GRAND_TOTAL ): case XML_ELEMENT( TABLE_EXT, XML_DATA_PILOT_GRAND_TOTAL ): { - pContext = new ScXMLDataPilotGrandTotalContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDataPilotGrandTotalContext(GetScImport(), xAttrList, this); } break; case XML_ELEMENT( TABLE, XML_SOURCE_CELL_RANGE ): { - pContext = new ScXMLSourceCellRangeContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLSourceCellRangeContext(GetScImport(), xAttrList, this); nSourceType = CELLRANGE; } break; case XML_ELEMENT( TABLE, XML_DATA_PILOT_FIELD ): - pContext = new ScXMLDataPilotFieldContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDataPilotFieldContext(GetScImport(), xAttrList, this); break; } @@ -575,7 +572,6 @@ void ScXMLDataPilotTableContext::SetGrandTotal( } ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : ScXMLImportContext( rImport ), @@ -609,7 +605,6 @@ ScXMLDPSourceSQLContext::~ScXMLDPSourceSQLContext() } ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : ScXMLImportContext( rImport ), @@ -641,7 +636,6 @@ ScXMLDPSourceTableContext::~ScXMLDPSourceTableContext() } ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : ScXMLImportContext( rImport ), @@ -672,7 +666,6 @@ ScXMLDPSourceQueryContext::~ScXMLDPSourceQueryContext() } ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : ScXMLImportContext( rImport ), @@ -712,7 +705,7 @@ ScXMLSourceServiceContext::~ScXMLSourceServiceContext() } ScXMLDataPilotGrandTotalContext::ScXMLDataPilotGrandTotalContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, const Reference<xml::sax::XFastAttributeList>& xAttrList, + ScXMLImport& rImport, const Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTableContext ) : ScXMLImportContext( rImport ), mpTableContext(pTableContext), @@ -775,7 +768,6 @@ ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext() } ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : ScXMLImportContext( rImport ), @@ -818,7 +810,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLSourceCellRangeCon switch (nElement) { case XML_ELEMENT( TABLE, XML_FILTER ): - pContext = new ScXMLDPFilterContext(GetScImport(), nElement, xAttrList, pDataPilotTable); + pContext = new ScXMLDPFilterContext(GetScImport(), xAttrList, pDataPilotTable); break; } @@ -829,7 +821,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLSourceCellRangeCon } ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : ScXMLImportContext( rImport ), @@ -917,13 +908,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotFieldCont switch (nElement) { case XML_ELEMENT( TABLE, XML_DATA_PILOT_LEVEL ): - pContext = new ScXMLDataPilotLevelContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDataPilotLevelContext(GetScImport(), xAttrList, this); break; case XML_ELEMENT( TABLE, XML_DATA_PILOT_FIELD_REFERENCE ): - pContext = new ScXMLDataPilotFieldReferenceContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDataPilotFieldReferenceContext(GetScImport(), xAttrList, this); break; case XML_ELEMENT( TABLE, XML_DATA_PILOT_GROUPS ): - pContext = new ScXMLDataPilotGroupsContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDataPilotGroupsContext(GetScImport(), xAttrList, this); break; } @@ -1018,7 +1009,7 @@ void SAL_CALL ScXMLDataPilotFieldContext::endFastElement( sal_Int32 /*nElement*/ } } -ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_Int32 /*+*/, +ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : ScXMLImportContext( rImport ) @@ -1087,7 +1078,6 @@ ScXMLDataPilotFieldReferenceContext::~ScXMLDataPilotFieldReferenceContext() } ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : ScXMLImportContext( rImport ), @@ -1125,19 +1115,19 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotLevelCont switch (nElement) { case XML_ELEMENT( TABLE, XML_DATA_PILOT_SUBTOTALS ): - pContext = new ScXMLDataPilotSubTotalsContext(GetScImport(), nElement, xAttrList, pDataPilotField); + pContext = new ScXMLDataPilotSubTotalsContext(GetScImport(), pDataPilotField); break; case XML_ELEMENT( TABLE, XML_DATA_PILOT_MEMBERS ): - pContext = new ScXMLDataPilotMembersContext(GetScImport(), nElement, xAttrList, pDataPilotField); + pContext = new ScXMLDataPilotMembersContext(GetScImport(), pDataPilotField); break; case XML_ELEMENT( TABLE, XML_DATA_PILOT_DISPLAY_INFO ): - pContext = new ScXMLDataPilotDisplayInfoContext(GetScImport(), nElement, xAttrList, pDataPilotField); + pContext = new ScXMLDataPilotDisplayInfoContext(GetScImport(), xAttrList, pDataPilotField); break; case XML_ELEMENT( TABLE, XML_DATA_PILOT_SORT_INFO ): - pContext = new ScXMLDataPilotSortInfoContext(GetScImport(), nElement, xAttrList, pDataPilotField); + pContext = new ScXMLDataPilotSortInfoContext(GetScImport(), xAttrList, pDataPilotField); break; case XML_ELEMENT( TABLE, XML_DATA_PILOT_LAYOUT_INFO ): - pContext = new ScXMLDataPilotLayoutInfoContext(GetScImport(), nElement, xAttrList, pDataPilotField); + pContext = new ScXMLDataPilotLayoutInfoContext(GetScImport(), xAttrList, pDataPilotField); break; } @@ -1147,7 +1137,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotLevelCont return pContext; } -ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : ScXMLImportContext( rImport ) @@ -1191,7 +1181,7 @@ ScXMLDataPilotDisplayInfoContext::~ScXMLDataPilotDisplayInfoContext() { } -ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : ScXMLImportContext( rImport ) @@ -1236,7 +1226,7 @@ ScXMLDataPilotSortInfoContext::~ScXMLDataPilotSortInfoContext() { } -ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_Int32 /*nElement*/, +ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : ScXMLImportContext( rImport ) @@ -1276,8 +1266,6 @@ ScXMLDataPilotLayoutInfoContext::~ScXMLDataPilotLayoutInfoContext() } ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */, ScXMLDataPilotFieldContext* pTempDataPilotField) : ScXMLImportContext( rImport ), pDataPilotField(pTempDataPilotField) @@ -1298,7 +1286,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotSubTotals switch (nElement) { case XML_ELEMENT( TABLE, XML_DATA_PILOT_SUBTOTAL ): - pContext = new ScXMLDataPilotSubTotalContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDataPilotSubTotalContext(GetScImport(), xAttrList, this); break; } @@ -1326,7 +1314,6 @@ void ScXMLDataPilotSubTotalsContext::SetDisplayName(const OUString& rName) } ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) : ScXMLImportContext( rImport ), @@ -1358,8 +1345,6 @@ ScXMLDataPilotSubTotalContext::~ScXMLDataPilotSubTotalContext() } ScXMLDataPilotMembersContext::ScXMLDataPilotMembersContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */, ScXMLDataPilotFieldContext* pTempDataPilotField) : ScXMLImportContext( rImport ), pDataPilotField(pTempDataPilotField) @@ -1379,7 +1364,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotMembersCo switch (nElement) { case XML_ELEMENT( TABLE, XML_DATA_PILOT_MEMBER ): - pContext = new ScXMLDataPilotMemberContext(GetScImport(), nElement, xAttrList, pDataPilotField); + pContext = new ScXMLDataPilotMemberContext(GetScImport(), xAttrList, pDataPilotField); break; } @@ -1390,7 +1375,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotMembersCo } ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : ScXMLImportContext( rImport ), @@ -1445,7 +1429,6 @@ void SAL_CALL ScXMLDataPilotMemberContext::endFastElement( sal_Int32 /*nElement* } ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : ScXMLImportContext( rImport ), @@ -1560,7 +1543,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotGroupsCon if (nElement == XML_ELEMENT( TABLE, XML_DATA_PILOT_GROUP )) { - pContext = new ScXMLDataPilotGroupContext(GetScImport(), nElement, xAttrList, pDataPilotField); + pContext = new ScXMLDataPilotGroupContext(GetScImport(), xAttrList, pDataPilotField); } if( !pContext ) @@ -1570,7 +1553,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotGroupsCon } ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : ScXMLImportContext( rImport ), @@ -1599,7 +1581,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDataPilotGroupCont if (nElement == XML_ELEMENT( TABLE, XML_DATA_PILOT_MEMBER ) || nElement == XML_ELEMENT( TABLE, XML_DATA_PILOT_GROUP_MEMBER )) { - pContext = new ScXMLDataPilotGroupMemberContext(GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDataPilotGroupMemberContext(GetScImport(), xAttrList, this); } if( !pContext ) @@ -1614,7 +1596,6 @@ void SAL_CALL ScXMLDataPilotGroupContext::endFastElement( sal_Int32 /*nElement*/ } ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotGroupContext* pTempDataPilotGroup) : ScXMLImportContext( rImport ), diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 5ab66f585a44..cf0a53fa4c37 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -52,8 +52,7 @@ class ScXMLDataPilotTablesContext : public ScXMLImportContext { public: - ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); + ScXMLDataPilotTablesContext( ScXMLImport& rImport); virtual ~ScXMLDataPilotTablesContext() override; @@ -113,7 +112,7 @@ class ScXMLDataPilotTableContext : public ScXMLImportContext public: - ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotTableContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); virtual ~ScXMLDataPilotTableContext() override; @@ -150,7 +149,7 @@ class ScXMLDPSourceSQLContext : public ScXMLImportContext public: - ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDPSourceSQLContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -163,7 +162,7 @@ class ScXMLDPSourceTableContext : public ScXMLImportContext public: - ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDPSourceTableContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -176,7 +175,7 @@ class ScXMLDPSourceQueryContext : public ScXMLImportContext public: - ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDPSourceQueryContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -189,7 +188,7 @@ class ScXMLSourceServiceContext : public ScXMLImportContext public: - ScXMLSourceServiceContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLSourceServiceContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -207,7 +206,7 @@ class ScXMLDataPilotGrandTotalContext : public ScXMLImportContext public: ScXMLDataPilotGrandTotalContext( - ScXMLImport& rImport, sal_Int32 nElement, + ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTableContext ); @@ -222,7 +221,7 @@ class ScXMLSourceCellRangeContext : public ScXMLImportContext public: - ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLSourceCellRangeContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -264,7 +263,7 @@ class ScXMLDataPilotFieldContext : public ScXMLImportContext public: - ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotFieldContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -304,7 +303,7 @@ class ScXMLDataPilotFieldReferenceContext : public ScXMLImportContext { public: - ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -317,7 +316,7 @@ class ScXMLDataPilotLevelContext : public ScXMLImportContext public: - ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotLevelContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -331,7 +330,7 @@ class ScXMLDataPilotDisplayInfoContext : public ScXMLImportContext { public: - ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -342,7 +341,7 @@ class ScXMLDataPilotSortInfoContext : public ScXMLImportContext { public: - ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -353,7 +352,7 @@ class ScXMLDataPilotLayoutInfoContext : public ScXMLImportContext { public: - ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -368,8 +367,7 @@ class ScXMLDataPilotSubTotalsContext : public ScXMLImportContext OUString maDisplayName; public: - ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotSubTotalsContext() override; @@ -388,7 +386,7 @@ class ScXMLDataPilotSubTotalContext : public ScXMLImportContext public: - ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals); @@ -401,8 +399,7 @@ class ScXMLDataPilotMembersContext : public ScXMLImportContext public: - ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLDataPilotMembersContext( ScXMLImport& rImport, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotMembersContext() override; @@ -423,7 +420,7 @@ class ScXMLDataPilotMemberContext : public ScXMLImportContext public: - ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotMemberContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -438,7 +435,7 @@ class ScXMLDataPilotGroupsContext : public ScXMLImportContext public: - ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotGroupsContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -457,7 +454,7 @@ class ScXMLDataPilotGroupContext : public ScXMLImportContext public: - ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotGroupContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -478,7 +475,7 @@ class ScXMLDataPilotGroupMemberContext : public ScXMLImportContext public: - ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotGroupContext* pDataPilotGroup); diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 22860afdf71d..dcace1cd141a 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -52,9 +52,7 @@ using namespace com::sun::star; using namespace xmloff::token; -ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */ ) : +ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport ) : ScXMLImportContext( rImport ) { // has no attributes @@ -76,7 +74,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDatabaseRangesCont { case XML_ELEMENT( TABLE, XML_DATABASE_RANGE ): { - pContext = new ScXMLDatabaseRangeContext( GetScImport(), nElement, xAttrList ); + pContext = new ScXMLDatabaseRangeContext( GetScImport(), xAttrList ); } break; } @@ -88,7 +86,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDatabaseRangesCont } ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList) : ScXMLImportContext( rImport ), mpQueryParam(new ScQueryParam), @@ -213,35 +210,35 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDatabaseRangeConte { case XML_ELEMENT( TABLE, XML_DATABASE_SOURCE_SQL ): { - pContext = new ScXMLSourceSQLContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLSourceSQLContext( GetScImport(), xAttrList, this); } break; case XML_ELEMENT( TABLE, XML_DATABASE_SOURCE_TABLE ): { - pContext = new ScXMLSourceTableContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLSourceTableContext( GetScImport(), xAttrList, this); } break; case XML_ELEMENT( TABLE, XML_DATABASE_SOURCE_QUERY ): { - pContext = new ScXMLSourceQueryContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLSourceQueryContext( GetScImport(), xAttrList, this); } break; case XML_ELEMENT( TABLE, XML_FILTER ): { pContext = new ScXMLFilterContext( - GetScImport(), nElement, xAttrList, *mpQueryParam, this); + GetScImport(), xAttrList, *mpQueryParam, this); } break; case XML_ELEMENT( TABLE, XML_SORT ): { bContainsSort = true; - pContext = new ScXMLSortContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLSortContext( GetScImport(), xAttrList, this); } break; case XML_ELEMENT( TABLE, XML_SUBTOTAL_RULES ): { bContainsSubTotal = true; - pContext = new ScXMLSubTotalRulesContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLSubTotalRulesContext( GetScImport(), xAttrList, this); } break; } @@ -455,7 +452,6 @@ void SAL_CALL ScXMLDatabaseRangeContext::endFastElement( sal_Int32 /*nElement*/ } ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : ScXMLImportContext( rImport ), @@ -496,7 +492,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLSourceSQLContext:: if ( nElement == XML_ELEMENT( FORM, XML_CONNECTION_RESOURCE ) && sDBName.isEmpty() ) { - pContext = new ScXMLConResContext( GetScImport(), nElement, xAttrList, pDatabaseRangeContext); + pContext = new ScXMLConResContext( GetScImport(), xAttrList, pDatabaseRangeContext); } if( !pContext ) @@ -512,7 +508,6 @@ void SAL_CALL ScXMLSourceSQLContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : ScXMLImportContext( rImport ), @@ -551,7 +546,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLSourceTableContext if ( nElement == XML_ELEMENT( FORM, XML_CONNECTION_RESOURCE ) && sDBName.isEmpty() ) { - pContext = new ScXMLConResContext( GetScImport(), nElement, xAttrList, pDatabaseRangeContext); + pContext = new ScXMLConResContext( GetScImport(), xAttrList, pDatabaseRangeContext); } if( !pContext ) @@ -567,7 +562,6 @@ void SAL_CALL ScXMLSourceTableContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : ScXMLImportContext( rImport ), @@ -605,7 +599,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLSourceQueryContext if ( nElement == XML_ELEMENT( FORM, XML_CONNECTION_RESOURCE ) && sDBName.isEmpty() ) { - pContext = new ScXMLConResContext( GetScImport(), nElement, xAttrList, pDatabaseRangeContext); + pContext = new ScXMLConResContext( GetScImport(), xAttrList, pDatabaseRangeContext); } if( !pContext ) @@ -621,7 +615,6 @@ void SAL_CALL ScXMLSourceQueryContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : ScXMLImportContext( rImport ), @@ -652,7 +645,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLConResContext::cre } ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : ScXMLImportContext( rImport ), @@ -694,12 +686,12 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLSubTotalRulesConte { case XML_ELEMENT( TABLE, XML_SORT_GROUPS ): { - pContext = new ScXMLSortGroupsContext( GetScImport(), nElement, xAttrList, pDatabaseRangeContext); + pContext = new ScXMLSortGroupsContext( GetScImport(), xAttrList, pDatabaseRangeContext); } break; case XML_ELEMENT( TABLE, XML_SUBTOTAL_RULE ): { - pContext = new ScXMLSubTotalRuleContext( GetScImport(), nElement, xAttrList, pDatabaseRangeContext); + pContext = new ScXMLSubTotalRuleContext( GetScImport(), xAttrList, pDatabaseRangeContext); } break; } @@ -711,7 +703,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLSubTotalRulesConte } ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : ScXMLImportContext( rImport ), @@ -781,7 +772,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLSortGroupsContext: } ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : ScXMLImportContext( rImport ), @@ -817,7 +807,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLSubTotalRuleContex { case XML_ELEMENT( TABLE, XML_SUBTOTAL_FIELD ): { - pContext = new ScXMLSubTotalFieldContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLSubTotalFieldContext( GetScImport(), xAttrList, this); } break; } @@ -835,7 +825,6 @@ void SAL_CALL ScXMLSubTotalRuleContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLSubTotalRuleContext* pTempSubTotalRuleContext) : ScXMLImportContext( rImport ), diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 0033ede753e6..6e7dbbe5ed8f 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -39,8 +39,7 @@ class ScXMLDatabaseRangesContext : public ScXMLImportContext { public: - ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); + ScXMLDatabaseRangesContext( ScXMLImport& rImport ); virtual ~ScXMLDatabaseRangesContext() override; @@ -93,7 +92,7 @@ class ScXMLDatabaseRangeContext : public ScXMLImportContext public: - ScXMLDatabaseRangeContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDatabaseRangeContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangeContext() override; @@ -128,7 +127,7 @@ class ScXMLSourceSQLContext : public ScXMLImportContext public: - ScXMLSourceSQLContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLSourceSQLContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -147,7 +146,7 @@ class ScXMLSourceTableContext : public ScXMLImportContext public: - ScXMLSourceTableContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLSourceTableContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -166,7 +165,7 @@ class ScXMLSourceQueryContext : public ScXMLImportContext public: - ScXMLSourceQueryContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLSourceQueryContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -184,7 +183,7 @@ class ScXMLConResContext : public ScXMLImportContext public: - ScXMLConResContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLConResContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -200,7 +199,7 @@ class ScXMLSubTotalRulesContext : public ScXMLImportContext public: - ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLSubTotalRulesContext( ScXMLImport& rImport, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -217,7 +216,7 @@ class ScXMLSortGroupsContext : public ScXMLImportContext public: - ScXMLSortGroupsContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLSortGroupsContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -234,7 +233,7 @@ class ScXMLSubTotalRuleContext : public ScXMLImportContext public: - ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLSubTotalRuleContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -258,7 +257,7 @@ class ScXMLSubTotalFieldContext : public ScXMLImportContext public: - ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLSubTotalFieldContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLSubTotalRuleContext* pSubTotalRuleContext); diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index fd209338b7f2..f6f7ab9a552c 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -672,7 +672,7 @@ void ScXMLExport::ExportFontDecls_() SvXMLExport::ExportFontDecls_(); } -table::CellRangeAddress ScXMLExport::GetEndAddress(const uno::Reference<sheet::XSpreadsheet>& xTable, const sal_Int32 /* nTable */) +table::CellRangeAddress ScXMLExport::GetEndAddress(const uno::Reference<sheet::XSpreadsheet>& xTable) { table::CellRangeAddress aCellAddress; uno::Reference<sheet::XSheetCellCursor> xCursor(xTable->createCursor()); @@ -1936,7 +1936,7 @@ void ScXMLExport::ExportContent_() aExportDatabaseRanges.WriteDatabaseRanges(); WriteExternalDataMapping(); ScXMLExportDataPilot aExportDataPilot(*this); - aExportDataPilot.WriteDataPilots(xSpreadDoc); + aExportDataPilot.WriteDataPilots(); WriteConsolidation(); ScXMLExportDDELinks aExportDDELinks(*this); aExportDDELinks.WriteDDELinks(xSpreadDoc); @@ -2581,7 +2581,7 @@ void ScXMLExport::ExportAutoStyles_() { sal_Int32 nColumns(pDoc->GetLastChangedCol(sal::static_int_cast<SCTAB>(nTable))); pSharedData->SetLastColumn(nTable, nColumns); - table::CellRangeAddress aCellAddress(GetEndAddress(xTable, nTable)); + table::CellRangeAddress aCellAddress(GetEndAddress(xTable)); if (aCellAddress.EndColumn > nColumns) { ++nColumns; @@ -2921,7 +2921,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const uno::Reference<sheet::XSpre GetShapeExport()->seekShapes(uno::Reference<drawing::XShapes>(pSharedData->GetDrawPage(nTable), uno::UNO_QUERY)); WriteTableShapes(); } - table::CellRangeAddress aRange(GetEndAddress(xTable, nTable)); + table::CellRangeAddress aRange(GetEndAddress(xTable)); pSharedData->SetLastColumn(nTable, aRange.EndColumn); pSharedData->SetLastRow(nTable, aRange.EndRow); mpCellsItr->SetCurrentTable(static_cast<SCTAB>(nTable), xCurrentTable); diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index e23241596d8a..6a9b102281d3 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -142,9 +142,7 @@ class ScXMLExport : public SvXMLExport void CollectInternalShape( css::uno::Reference< css::drawing::XShape > const & xShape ); - static css::table::CellRangeAddress GetEndAddress(const css::uno::Reference<css::sheet::XSpreadsheet>& xTable, - const sal_Int32 nTable); -// ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges(); + static css::table::CellRangeAddress GetEndAddress(const css::uno::Reference<css::sheet::XSpreadsheet>& xTable); void GetAreaLinks( ScMyAreaLinksContainer& rAreaLinks ); void GetDetectiveOpList( ScMyDetectiveOpContainer& rDetOp ); void WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_Int32 nStyleIndex, diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 57cbbfda420d..33b92fc2dcdb 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::xml::sax; using ::com::sun::star::uno::Reference; ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, + ScXMLImport& rImport, const Reference<XFastAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ) : ScXMLImportContext( rImport ), mrScImport(rImport), @@ -119,8 +119,7 @@ void SAL_CALL ScXMLExternalRefTabSourceContext::endFastElement( sal_Int32 /*nEle } ScXMLExternalRefRowsContext::ScXMLExternalRefRowsContext( - ScXMLImport& rImport, sal_Int32 /* nElement */, - const Reference<XFastAttributeList>& /* xAttrList */, ScXMLExternalTabData& rRefInfo ) : + ScXMLImport& rImport, ScXMLExternalTabData& rRefInfo ) : ScXMLImportContext( rImport ), mrScImport(rImport), mrExternalRefInfo(rRefInfo) @@ -145,10 +144,10 @@ Reference< XFastContextHandler > SAL_CALL ScXMLExternalRefRowsContext::createFas case XML_TOK_TABLE_ROWS_HEADER_ROWS: case XML_TOK_TABLE_ROWS_ROWS: return new ScXMLExternalRefRowsContext( - mrScImport, nElement, xAttrList, mrExternalRefInfo); + mrScImport, mrExternalRefInfo); case XML_TOK_TABLE_ROWS_ROW: return new ScXMLExternalRefRowContext( - mrScImport, nElement, xAttrList, mrExternalRefInfo); + mrScImport, xAttrList, mrExternalRefInfo); default: ; } @@ -156,7 +155,7 @@ Reference< XFastContextHandler > SAL_CALL ScXMLExternalRefRowsContext::createFas } ScXMLExternalRefRowContext::ScXMLExternalRefRowContext( - ScXMLImport& rImport, sal_Int32 /* nElement */, + ScXMLImport& rImport, const Reference<XFastAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ) : ScXMLImportContext( rImport ), mrScImport(rImport), @@ -195,7 +194,7 @@ Reference< XFastContextHandler > SAL_CALL ScXMLExternalRefRowContext::createFast const SvXMLTokenMap& rTokenMap = mrScImport.GetTableRowElemTokenMap(); sal_uInt16 nToken = rTokenMap.Get( nElement ); if (nToken == XML_TOK_TABLE_ROW_CELL || nToken == XML_TOK_TABLE_ROW_COVERED_CELL) - return new ScXMLExternalRefCellContext(mrScImport, nElement, xAttrList, mrExternalRefInfo); + return new ScXMLExternalRefCellContext(mrScImport, xAttrList, mrExternalRefInfo); return new SvXMLImportContext( GetImport() ); } @@ -231,7 +230,7 @@ void SAL_CALL ScXMLExternalRefRowContext::endFastElement( sal_Int32 /* nElement } ScXMLExternalRefCellContext::ScXMLExternalRefCellContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, + ScXMLImport& rImport, const Reference<XFastAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ) : ScXMLImportContext( rImport ), mrScImport(rImport), @@ -336,12 +335,12 @@ ScXMLExternalRefCellContext::~ScXMLExternalRefCellContext() } Reference< XFastContextHandler > SAL_CALL ScXMLExternalRefCellContext::createFastChildContext( - sal_Int32 nElement, const Reference< XFastAttributeList >& xAttrList ) + sal_Int32 nElement, const Reference< XFastAttributeList >& /*xAttrList*/ ) { const SvXMLTokenMap& rTokenMap = mrScImport.GetTableRowCellElemTokenMap(); sal_uInt16 nToken = rTokenMap.Get( nElement ); if (nToken == XML_TOK_TABLE_ROW_CELL_P) - return new ScXMLExternalRefCellTextContext(mrScImport, nElement, xAttrList, *this); + return new ScXMLExternalRefCellTextContext(mrScImport, *this); return new SvXMLImportContext( GetImport() ); } @@ -380,8 +379,7 @@ void ScXMLExternalRefCellContext::SetCellString(const OUString& rStr) } ScXMLExternalRefCellTextContext::ScXMLExternalRefCellTextContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, - const Reference<XFastAttributeList>& /*xAttrList*/, + ScXMLImport& rImport, ScXMLExternalRefCellContext& rParent ) : ScXMLImportContext( rImport ), mrParent(rParent) diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index aa19a5b74b29..230a1382e6ac 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -30,7 +30,7 @@ struct ScXMLExternalTabData; class ScXMLExternalRefTabSourceContext : public ScXMLImportContext { public: - ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -55,8 +55,7 @@ private: class ScXMLExternalRefRowsContext : public ScXMLImportContext { public: - ScXMLExternalRefRowsContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLExternalRefRowsContext( ScXMLImport& rImport, ScXMLExternalTabData& rRefInfo ); virtual ~ScXMLExternalRefRowsContext() override; @@ -73,7 +72,7 @@ private: class ScXMLExternalRefRowContext : public ScXMLImportContext { public: - ScXMLExternalRefRowContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLExternalRefRowContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -94,7 +93,7 @@ private: class ScXMLExternalRefCellContext : public ScXMLImportContext { public: - ScXMLExternalRefCellContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLExternalRefCellContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -123,8 +122,7 @@ private: class ScXMLExternalRefCellTextContext : public ScXMLImportContext { public: - ScXMLExternalRefCellTextContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLExternalRefCellTextContext( ScXMLImport& rImport, ScXMLExternalRefCellContext& rParent ); virtual ~ScXMLExternalRefCellTextContext() override; diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index b3c6349a8c9b..ebe15e1b7f7d 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -41,7 +41,6 @@ using ::com::sun::star::xml::sax::XAttributeList; ScXMLFilterContext::ConnStackItem::ConnStackItem(bool bOr) : mbOr(bOr), mnCondCount(0) {} ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScQueryParam& rParam, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -110,13 +109,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLFilterContext::cre case XML_ELEMENT( TABLE, XML_FILTER_AND ): { pContext = new ScXMLAndContext( - GetScImport(), nElement, xAttrList, mrQueryParam, this); + GetScImport(), mrQueryParam, this); } break; case XML_ELEMENT( TABLE, XML_FILTER_OR ): { pContext = new ScXMLOrContext( - GetScImport(), nElement, xAttrList, mrQueryParam, this); + GetScImport(), mrQueryParam, this); } break; case XML_ELEMENT( TABLE, XML_FILTER_CONDITION ): @@ -192,8 +191,6 @@ bool ScXMLFilterContext::GetConnection() } ScXMLAndContext::ScXMLAndContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const uno::Reference<xml::sax::XFastAttributeList>& /* xAttrList */, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext) : ScXMLImportContext( rImport ), @@ -239,8 +236,6 @@ void SAL_CALL ScXMLAndContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLOrContext::ScXMLOrContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext) : ScXMLImportContext( rImport ), @@ -264,7 +259,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLOrContext::createF case XML_ELEMENT( TABLE, XML_FILTER_AND ): { pContext = new ScXMLAndContext( - GetScImport(), nElement, xAttrList, mrQueryParam, pFilterContext); + GetScImport(), mrQueryParam, pFilterContext); } break; case XML_ELEMENT( TABLE, XML_FILTER_CONDITION ): @@ -487,7 +482,6 @@ ScXMLSetItemContext::~ScXMLSetItemContext() } ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTableContext) : ScXMLImportContext( rImport ), @@ -559,12 +553,12 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDPFilterContext::c { case XML_ELEMENT( TABLE, XML_FILTER_AND ): { - pContext = new ScXMLDPAndContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDPAndContext( GetScImport(), this); } break; case XML_ELEMENT( TABLE, XML_FILTER_OR ): { - pContext = new ScXMLDPOrContext( GetScImport(), nElement, xAttrList, this); + pContext = new ScXMLDPOrContext( GetScImport(), this); } break; case XML_ELEMENT( TABLE, XML_FILTER_CONDITION ): @@ -603,8 +597,6 @@ void ScXMLDPFilterContext::AddFilterField (const ScQueryEntry& aFilterField) } ScXMLDPAndContext::ScXMLDPAndContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */, ScXMLDPFilterContext* pTempFilterContext) : ScXMLImportContext( rImport ) { @@ -647,9 +639,7 @@ void SAL_CALL ScXMLDPAndContext::endFastElement( sal_Int32 /*nElement*/ ) } ScXMLDPOrContext::ScXMLDPOrContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */, - ScXMLDPFilterContext* pTempFilterContext) : + ScXMLDPFilterContext* pTempFilterContext) : ScXMLImportContext( rImport ), pFilterContext(pTempFilterContext) { @@ -669,7 +659,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDPOrContext::creat { case XML_ELEMENT( TABLE, XML_FILTER_AND ): { - pContext = new ScXMLDPAndContext( GetScImport(), nElement, xAttrList, pFilterContext); + pContext = new ScXMLDPAndContext( GetScImport(), pFilterContext); } break; case XML_ELEMENT( TABLE, XML_FILTER_CONDITION ): diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 224a2f5c2da5..a7161e6a9296 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -55,7 +55,7 @@ class ScXMLFilterContext : public ScXMLImportContext public: - ScXMLFilterContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLFilterContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScQueryParam& rParam, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -79,8 +79,7 @@ class ScXMLAndContext : public ScXMLImportContext public: - ScXMLAndContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLAndContext( ScXMLImport& rImport, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext); @@ -99,8 +98,7 @@ class ScXMLOrContext : public ScXMLImportContext public: - ScXMLOrContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLOrContext( ScXMLImport& rImport, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext); @@ -173,7 +171,7 @@ class ScXMLDPFilterContext : public ScXMLImportContext public: - ScXMLDPFilterContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLDPFilterContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTableContext); @@ -222,8 +220,7 @@ class ScXMLDPAndContext : public ScXMLImportContext ScXMLDPFilterContext* pFilterContext; public: - ScXMLDPAndContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLDPAndContext( ScXMLImport& rImport, ScXMLDPFilterContext* pTempFilterContext); virtual ~ScXMLDPAndContext() override; @@ -239,8 +236,7 @@ class ScXMLDPOrContext : public ScXMLImportContext ScXMLDPFilterContext* pFilterContext; public: - ScXMLDPOrContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLDPOrContext( ScXMLImport& rImport, ScXMLDPFilterContext* pTempFilterContext); virtual ~ScXMLDPOrContext() override; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 2893c9e354e1..4d89cf3cadac 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -231,8 +231,7 @@ protected: public: ScXMLDocContext_Impl( ScXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, - const uno::Reference<xml::sax::XAttributeList>& xAttrList ); + const OUString& rLName ); ScXMLDocContext_Impl( ScXMLImport& rImport ); @@ -253,8 +252,7 @@ public: }; ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, - const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */ ) : + const OUString& rLName ) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -272,11 +270,9 @@ class ScXMLFlatDocContext_Impl public: ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, sal_uInt16 i_nPrefix, const OUString & i_rLName, - const uno::Reference<xml::sax::XAttributeList>& i_xAttrList, const uno::Reference<document::XDocumentProperties>& i_xDocProps); ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, - const uno::Reference<xml::sax::XFastAttributeList>& i_xAttrList, const uno::Reference<document::XDocumentProperties>& i_xDocProps); virtual SvXMLImportContext *CreateChildContext( @@ -295,17 +291,15 @@ public: ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, sal_uInt16 i_nPrefix, const OUString & i_rLName, - const uno::Reference<xml::sax::XAttributeList>& i_xAttrList, const uno::Reference<document::XDocumentProperties>& i_xDocProps) : SvXMLImportContext(i_rImport, i_nPrefix, i_rLName), -ScXMLDocContext_Impl(i_rImport, i_nPrefix, i_rLName, i_xAttrList), +ScXMLDocContext_Impl(i_rImport, i_nPrefix, i_rLName), SvXMLMetaDocumentContext(i_rImport, i_nPrefix, i_rLName, i_xDocProps) { } ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, - const uno::Reference<xml::sax::XFastAttributeList>& /*i_xAttrList*/, const uno::Reference<document::XDocumentProperties>& i_xDocProps) : SvXMLImportContext(i_rImport), ScXMLDocContext_Impl(i_rImport), @@ -673,7 +667,7 @@ SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix, GetModel(), uno::UNO_QUERY_THROW); // flat OpenDocument file format pContext = new ScXMLFlatDocContext_Impl( *this, nPrefix, rLocalName, - xAttrList, xDPS->getDocumentProperties()); + xDPS->getDocumentProperties()); } else pContext = SvXMLImport::CreateContext( nPrefix, rLocalName, xAttrList ); @@ -682,7 +676,7 @@ SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix, } SvXMLImportContext *ScXMLImport::CreateFastContext( sal_Int32 nElement, - const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) + const uno::Reference< xml::sax::XFastAttributeList >& /*xAttrList*/ ) { SvXMLImportContext *pContext = nullptr; @@ -700,7 +694,7 @@ SvXMLImportContext *ScXMLImport::CreateFastContext( sal_Int32 nElement, GetModel(), uno::UNO_QUERY_THROW); // flat OpenDocument file format pContext = new ScXMLFlatDocContext_Impl( *this, - xAttrList, xDPS->getDocumentProperties()); + xDPS->getDocumentProperties()); break; } diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 2c8d31e105e0..be44364abb75 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.cxx @@ -29,9 +29,7 @@ using namespace ::com::sun::star; using namespace xmloff::token; ScXMLLabelRangesContext::ScXMLLabelRangesContext( - ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const uno::Reference< xml::sax::XFastAttributeList >& /* xAttrList */ ): + ScXMLImport& rImport ): ScXMLImportContext( rImport ) { rImport.LockSolarMutex(); @@ -50,7 +48,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLLabelRangesContext switch (nElement) { case XML_ELEMENT( TABLE, XML_LABEL_RANGE ): - pContext = new ScXMLLabelRangeContext( GetScImport(), nElement, xAttrList ); + pContext = new ScXMLLabelRangeContext( GetScImport(), xAttrList ); break; } if( !pContext ) @@ -61,7 +59,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLLabelRangesContext ScXMLLabelRangeContext::ScXMLLabelRangeContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) : ScXMLImportContext( rImport ), bColumnOrientation( false ) diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index f4e3db7bc0cf..873f249a417e 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -27,9 +27,7 @@ class ScXMLLabelRangesContext : public ScXMLImportContext { public: ScXMLLabelRangesContext( - ScXMLImport& rImport, - sal_Int32 nElement, - const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList + ScXMLImport& rImport ); virtual ~ScXMLLabelRangesContext() override; @@ -50,7 +48,6 @@ private: public: ScXMLLabelRangeContext( ScXMLImport& rImport, - sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList ); virtual ~ScXMLLabelRangeContext() override; diff --git a/sc/source/filter/xml/xmlmappingi.cxx b/sc/source/filter/xml/xmlmappingi.cxx index b32dbd9c72f7..9560a6e98979 100644 --- a/sc/source/filter/xml/xmlmappingi.cxx +++ b/sc/source/filter/xml/xmlmappingi.cxx @@ -24,9 +24,7 @@ using namespace com::sun::star; using namespace xmloff::token; -ScXMLMappingsContext::ScXMLMappingsContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */ ) : +ScXMLMappingsContext::ScXMLMappingsContext( ScXMLImport& rImport ) : ScXMLImportContext( rImport ) { // has no attributes @@ -48,7 +46,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLMappingsContext::c { case XML_ELEMENT( CALC_EXT, XML_DATA_MAPPING ): { - pContext = new ScXMLMappingContext( GetScImport(), nElement, xAttrList ); + pContext = new ScXMLMappingContext( GetScImport(), xAttrList ); } break; } @@ -60,7 +58,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLMappingsContext::c } ScXMLMappingContext::ScXMLMappingContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList) : ScXMLImportContext( rImport ) { diff --git a/sc/source/filter/xml/xmlmappingi.hxx b/sc/source/filter/xml/xmlmappingi.hxx index 2fafd98ed74b..deba994608f3 100644 --- a/sc/source/filter/xml/xmlmappingi.hxx +++ b/sc/source/filter/xml/xmlmappingi.hxx @@ -20,8 +20,7 @@ class ScXMLMappingsContext : public ScXMLImportContext { public: - ScXMLMappingsContext( ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); + ScXMLMappingsContext( ScXMLImport& rImport ); virtual ~ScXMLMappingsContext() override; @@ -35,7 +34,7 @@ class ScXMLMappingContext : public ScXMLImportContext public: - ScXMLMappingContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLMappingContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList); virtual ~ScXMLMappingContext() override; diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index b6a8f507699f..b59dfc313138 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -47,8 +47,7 @@ void ScXMLNamedExpressionsContext::SheetLocalInserter::insert(ScMyNamedExpressio } ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, - const uno::Reference<xml::sax::XFastAttributeList>& /* xAttrList */, + ScXMLImport& rImport, Inserter* pInserter ) : ScXMLImportContext( rImport ), mpInserter(pInserter) @@ -70,11 +69,11 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLNamedExpressionsCo { case XML_ELEMENT( TABLE, XML_NAMED_RANGE ): pContext = new ScXMLNamedRangeContext( - GetScImport(), nElement, xAttrList, mpInserter.get() ); + GetScImport(), xAttrList, mpInserter.get() ); break; case XML_ELEMENT( TABLE, XML_NAMED_EXPRESSION ): pContext = new ScXMLNamedExpressionContext( - GetScImport(), nElement, xAttrList, mpInserter.get() ); + GetScImport(), xAttrList, mpInserter.get() ); break; } @@ -86,7 +85,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLNamedExpressionsCo ScXMLNamedRangeContext::ScXMLNamedRangeContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ) : ScXMLImportContext( rImport ), @@ -141,7 +139,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLNamedRangeContext: } ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, + ScXMLImport& rImport, const uno::Reference<xml::sax::XFastAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ) : ScXMLImportContext( rImport ), diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index 2a6be588e732..904f7daf1373 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -70,8 +70,7 @@ public: }; ScXMLNamedExpressionsContext( - ScXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, + ScXMLImport& rImport, Inserter* pInserter ); virtual ~ScXMLNamedExpressionsContext() override; @@ -88,7 +87,7 @@ class ScXMLNamedRangeContext : public ScXMLImportContext public: ScXMLNamedRangeContext( - ScXMLImport& rImport, sal_Int32 nElement, + ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ); @@ -106,7 +105,7 @@ class ScXMLNamedExpressionContext : public ScXMLImportContext public: ScXMLNamedExpressionContext( - ScXMLImport& rImport, sal_Int32 nElement, + ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ); diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index 024863fe50c0..b82087a9842a 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.cxx @@ -37,7 +37,6 @@ using namespace xmloff::token; ScXMLTableScenarioContext::ScXMLTableScenarioContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ): ScXMLImportContext( rImport ), aBorderColor( COL_BLACK ), diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index 6aa3474aef37..a59f0ccde252 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -42,7 +42,7 @@ private: public: - ScXMLTableScenarioContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLTableScenarioContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ); virtual ~ScXMLTableScenarioContext() override; diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index e7689f3f895e..5c4024fe15d5 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star; using namespace xmloff::token; ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, - sal_Int32 /*nElement*/, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index 87a0713f18d1..41f60b1e4651 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -46,7 +46,7 @@ class ScXMLSortContext : public ScXMLImportContext public: - ScXMLSortContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLSortContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index 28bfbe66a5c5..969ff25cb0b2 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -268,13 +268,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL case XML_ELEMENT( TABLE, XML_TABLE_ROWS ): // #i101319# don't discard rows in groups or header (repeat range) return new ScXMLExternalRefRowsContext( - GetScImport(), nElement, xAttrList, *pExternalRefInfo); + GetScImport(), *pExternalRefInfo); case XML_ELEMENT( TABLE, XML_TABLE_ROW ): return new ScXMLExternalRefRowContext( - GetScImport(), nElement, xAttrList, *pExternalRefInfo); + GetScImport(), xAttrList, *pExternalRefInfo); case XML_ELEMENT( TABLE, XML_TABLE_SOURCE ): return new ScXMLExternalRefTabSourceContext( - GetScImport(), nElement, xAttrList, *pExternalRefInfo); + GetScImport(), xAttrList, *pExternalRefInfo); default: ; } @@ -289,29 +289,29 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL { SCTAB nTab = GetScImport().GetTables().GetCurrentSheet(); pContext = new ScXMLNamedExpressionsContext( - GetScImport(), nElement, xAttrList, + GetScImport(), new ScXMLNamedExpressionsContext::SheetLocalInserter(GetScImport(), nTab)); } break; case XML_ELEMENT( TABLE, XML_TABLE_COLUMN_GROUP ): - pContext = new ScXMLTableColsContext( GetScImport(), nElement, xAttrList, + pContext = new ScXMLTableColsContext( GetScImport(), xAttrList, false, true ); break; case XML_ELEMENT( TABLE, XML_TABLE_HEADER_COLUMNS ): - pContext = new ScXMLTableColsContext( GetScImport(), nElement, xAttrList, + pContext = new ScXMLTableColsContext( GetScImport(), xAttrList, true, false ); break; case XML_ELEMENT( TABLE, XML_TABLE_COLUMNS ): - pContext = new ScXMLTableColsContext( GetScImport(), nElement, xAttrList, + pContext = new ScXMLTableColsContext( GetScImport(), xAttrList, false, false ); break; case XML_ELEMENT( TABLE, XML_TABLE_COLUMN ): - pContext = new ScXMLTableColContext( GetScImport(), nElement, xAttrList ); + pContext = new ScXMLTableColContext( GetScImport(), xAttrList ); break; case XML_ELEMENT( TABLE, XML_TABLE_PROTECTION ): case XML_ELEMENT( LO_EXT, XML_TABLE_PROTECTION ): case XML_ELEMENT( OFFICE_EXT, XML_TABLE_PROTECTION ): - pContext = new ScXMLTableProtectionContext( GetScImport(), nElement, xAttrList ); + pContext = new ScXMLTableProtectionContext( GetScImport(), xAttrList ); break; case XML_ELEMENT( TABLE, XML_TABLE_ROW_GROUP ): pContext = new ScXMLTableRowsContext( GetScImport(), xAttrList, @@ -329,16 +329,16 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL pContext = new ScXMLTableRowContext( GetScImport(),xAttrList ); break; case XML_ELEMENT( TABLE, XML_TABLE_SOURCE ): - pContext = new ScXMLTableSourceContext( GetScImport(), nElement, xAttrList); + pContext = new ScXMLTableSourceContext( GetScImport(), xAttrList); break; case XML_ELEMENT( TABLE, XML_SCENARIO ): - pContext = new ScXMLTableScenarioContext( GetScImport(), nElement, xAttrList); + pContext = new ScXMLTableScenarioContext( GetScImport(), xAttrList); break; case XML_ELEMENT( TABLE, XML_SHAPES ): - pContext = new ScXMLTableShapesContext( GetScImport(), nElement, xAttrList); + pContext = new ScXMLTableShapesContext( GetScImport() ); break; case XML_ELEMENT( CALC_EXT, XML_CONDITIONAL_FORMATS ): - pContext = new ScXMLConditionalFormatsContext( GetScImport(), nElement ); + pContext = new ScXMLConditionalFormatsContext( GetScImport() ); break; default: pContext = new SvXMLImportContext( GetImport() ); @@ -429,7 +429,7 @@ void SAL_CALL ScXMLTableContext::endFastElement(sal_Int32 /*nElement*/) } ScXMLTableProtectionContext::ScXMLTableProtectionContext( - ScXMLImport& rImport, sal_Int32 /*nElement*/, + ScXMLImport& rImport, const Reference< xml::sax::XFastAttributeList>& xAttrList ) : ScXMLImportContext( rImport ) { diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 9f9775ec0876..ba8822145aad 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -67,7 +67,7 @@ public: class ScXMLTableProtectionContext : public ScXMLImportContext { public: - ScXMLTableProtectionContext( ScXMLImport& rImport, sal_Int32 nElement, + ScXMLTableProtectionContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ); virtual ~ScXMLTableProtectionContext() override; |