diff options
| author | Noel <noelgrandin@gmail.com> | 2020-11-19 15:53:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-20 07:22:26 +0100 |
| commit | bfaa753ae459a6eab8a216b1541faa8a805f3f50 (patch) | |
| tree | 6667b9f178b9d73a0c048f03e25cb47ebd8b5e74 | |
| parent | cdae2f16ef9da75c1b3f9cc3f8abc3a180f324d1 (diff) | |
simplify CreateTableContext
Change-Id: I1700d17d6f3aa29fcc4a1ea33d8d797e67c301d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106168
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/xmloff/table/XMLTableImport.hxx | 3 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/table/XMLTableImport.cxx | 10 |
3 files changed, 7 insertions, 8 deletions
diff --git a/include/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx index cb6e2da7b48c..c0f702b5caaa 100644 --- a/include/xmloff/table/XMLTableImport.hxx +++ b/include/xmloff/table/XMLTableImport.hxx @@ -46,8 +46,7 @@ public: XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLPropertySetMapper >& xCellPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef ); virtual ~XMLTableImport() override; - SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const OUString& rLName, - css::uno::Reference< css::table::XColumnRowRange > const & xColumnRowRange ); + SvXMLImportContext* CreateTableContext( css::uno::Reference< css::table::XColumnRowRange > const & xColumnRowRange ); SvXMLStyleContext* CreateTableTemplateContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ); diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index dd46ab98a164..7558ff5e0c62 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -3981,7 +3981,7 @@ void SdXMLTableShapeContext::StartElement( const css::uno::Reference< css::xml:: xProps->getPropertyValue("Model"), uno::UNO_QUERY ); if( xColumnRowRange.is() ) - mxTableImportContext = xTableImport->CreateTableContext( GetPrefix(), GetLocalName(), xColumnRowRange ); + mxTableImportContext = xTableImport->CreateTableContext( xColumnRowRange ); if( mxTableImportContext.is() ) mxTableImportContext->StartElement( xAttrList ); diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 8eb7a22f7be4..aa89732a4c81 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -96,7 +96,7 @@ typedef std::vector< std::shared_ptr< MergeInfo > > MergeInfoVector; class XMLTableImportContext : public SvXMLImportContext { public: - XMLTableImportContext( const rtl::Reference< XMLTableImport >& xThis, sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange > const & xColumnRowRange ); + XMLTableImportContext( const rtl::Reference< XMLTableImport >& xThis, Reference< XColumnRowRange > const & xColumnRowRange ); virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; @@ -227,10 +227,10 @@ XMLTableImport::~XMLTableImport() { } -SvXMLImportContext* XMLTableImport::CreateTableContext( sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange > const & xColumnRowRange ) +SvXMLImportContext* XMLTableImport::CreateTableContext( Reference< XColumnRowRange > const & xColumnRowRange ) { rtl::Reference< XMLTableImport > xThis( this ); - return new XMLTableImportContext( xThis, nPrfx, rLName, xColumnRowRange ); + return new XMLTableImportContext( xThis, xColumnRowRange ); } SvXMLStyleContext* XMLTableImport::CreateTableTemplateContext( sal_Int32 /*nElement*/, const Reference< XFastAttributeList >& /*xAttrList*/ ) @@ -358,8 +358,8 @@ void XMLTableImport::finishStyles() } -XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange > const & xColumnRowRange ) -: SvXMLImportContext( xImporter->mrImport, nPrfx, rLName ) +XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, Reference< XColumnRowRange > const & xColumnRowRange ) +: SvXMLImportContext( xImporter->mrImport ) , mxTable( xColumnRowRange, UNO_QUERY ) , mxColumns( xColumnRowRange->getColumns() ) , mxRows( xColumnRowRange->getRows() ) |