diff options
| -rw-r--r-- | include/xmloff/SchXMLImportHelper.hxx | 4 | ||||
| -rw-r--r-- | xmloff/source/chart/SchXMLChartContext.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/chart/SchXMLChartContext.hxx | 2 | ||||
| -rw-r--r-- | xmloff/source/chart/SchXMLImport.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/chart/contexts.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 2 |
6 files changed, 8 insertions, 15 deletions
diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index 09031b2ccc21..f60c222cba50 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -83,9 +83,7 @@ public: */ SvXMLImportContext* CreateChartContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const OUString& rLocalName, - const css::uno::Reference< css::frame::XModel >& rChartModel, - const css::uno::Reference< css::xml::sax::XAttributeList >& rAttrList ); + const css::uno::Reference< css::frame::XModel >& rChartModel ); /** set the auto-style context that will be used to retrieve auto-styles used inside the following <chart:chart> element to parse diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index b8ec262621f4..cbef46fa0ab0 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -221,8 +221,8 @@ uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const OUString& rStr } // anonymous namespace SchXMLChartContext::SchXMLChartContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const OUString& rLocalName ) : - SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), + SvXMLImport& rImport ) : + SvXMLImportContext( rImport ), mrImportHelper( rImpHelper ), m_bHasRangeAtPlotArea( false ), m_bHasTableElement( false ), diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index 5081decd2412..afc15a16f12e 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -76,7 +76,7 @@ class SchXMLChartContext : public SvXMLImportContext { public: SchXMLChartContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const OUString& rLocalName ); + SvXMLImport& rImport ); virtual ~SchXMLChartContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 58a53724ed9e..53d10e349756 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -85,9 +85,7 @@ SchXMLImportHelper::SchXMLImportHelper() : SvXMLImportContext* SchXMLImportHelper::CreateChartContext( SvXMLImport& rImport, - sal_uInt16 /*nPrefix*/, const OUString& rLocalName, - const Reference< frame::XModel >& rChartModel, - const Reference< xml::sax::XAttributeList >& ) + const Reference< frame::XModel >& rChartModel ) { SvXMLImportContext* pContext = nullptr; @@ -95,7 +93,7 @@ SvXMLImportContext* SchXMLImportHelper::CreateChartContext( if( xDoc.is()) { mxChartDoc = xDoc; - pContext = new SchXMLChartContext( *this, rImport, rLocalName ); + pContext = new SchXMLChartContext( *this, rImport ); } else { diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index b39ba4efbfae..af016b4bfde2 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -170,10 +170,7 @@ SvXMLImportContextRef SchXMLBodyContext::CreateChildContext( if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_CHART ) ) { - xContext = mrImportHelper.CreateChartContext( GetImport(), - nPrefix, rLocalName, - GetImport().GetModel(), - xAttrList ); + xContext = mrImportHelper.CreateChartContext( GetImport(), GetImport().GetModel() ); } else if(nPrefix == XML_NAMESPACE_TABLE && IsXMLToken( rLocalName, XML_CALCULATION_SETTINGS )) diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index cc75d01b80c6..dd46ab98a164 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -2550,7 +2550,7 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri uno::Reference< frame::XModel > xChartModel; if( aAny >>= xChartModel ) { - mxChartContext.set( GetImport().GetChartImport()->CreateChartContext( GetImport(), XML_NAMESPACE_SVG, GetXMLToken(XML_CHART), xChartModel, xAttrList ) ); + mxChartContext.set( GetImport().GetChartImport()->CreateChartContext( GetImport(), xChartModel ) ); } } } |