diff options
author | Noel <noelgrandin@gmail.com> | 2020-11-16 10:58:18 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-16 12:18:37 +0100 |
commit | d828901d92c5c74627018dd84400d5de87b153af (patch) | |
tree | a34a4bbf2d7d8f9fd15be62f5ad12912bd50fffa /xmloff | |
parent | f05246dc2ae1145f54e1b6e53b47fd53382add96 (diff) |
simplify CreateChartContext, remove unused params
Change-Id: I91db68fa20e00ac6b7ec0c991016f4155c6ed70c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105915
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
-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 |
5 files changed, 7 insertions, 12 deletions
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 ) ); } } } |