From b541cd9a8038810ce449f8c49ae179d9d6eaa7e8 Mon Sep 17 00:00:00 2001 From: Noel Date: Mon, 7 Dec 2020 16:06:50 +0200 Subject: loplugin:unusedmethods Change-Id: Ib51fd610c5188fe95872d509f004ae88f38c5417 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107351 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/source/filter/xml/xmlimprt.cxx | 58 --------------------------------------- sc/source/filter/xml/xmlimprt.hxx | 4 --- 2 files changed, 62 deletions(-) (limited to 'sc') diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index fb226b7c30ad..6af5959a66e9 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -332,40 +332,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL return pContext; } -const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap() -{ - if( !pTableElemTokenMap ) - { - static const SvXMLTokenMapEntry aTableTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, XML_TOK_TABLE_NAMED_EXPRESSIONS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COL_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, - { XML_NAMESPACE_TABLE, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION }, - { XML_NAMESPACE_LO_EXT, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION_EXT }, - { XML_NAMESPACE_OFFICE_EXT, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION_EXT }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, - { XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, XML_TOK_TABLE_SOURCE }, - { XML_NAMESPACE_TABLE, XML_SCENARIO, XML_TOK_TABLE_SCENARIO }, - { XML_NAMESPACE_TABLE, XML_SHAPES, XML_TOK_TABLE_SHAPES }, - { XML_NAMESPACE_OFFICE, XML_FORMS, XML_TOK_TABLE_FORMS }, - { XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, XML_TOK_TABLE_EVENT_LISTENERS }, - { XML_NAMESPACE_OFFICE_EXT, XML_EVENT_LISTENERS, XML_TOK_TABLE_EVENT_LISTENERS_EXT }, - { XML_NAMESPACE_CALC_EXT, XML_CONDITIONAL_FORMATS, XML_TOK_TABLE_CONDFORMATS }, - XML_TOKEN_MAP_END - }; - - pTableElemTokenMap.reset(new SvXMLTokenMap( aTableTokenMap )); - } // if( !pTableElemTokenMap ) - - return *pTableElemTokenMap; -} - const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap() { if( !pTableRowsElemTokenMap ) @@ -442,28 +408,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap() return *pTableRowCellElemTokenMap; } -const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap() -{ - if( !pTableAnnotationAttrTokenMap ) - { - static const SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] = - { - { XML_NAMESPACE_OFFICE, XML_AUTHOR, XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR }, - { XML_NAMESPACE_OFFICE, XML_CREATE_DATE, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE }, - { XML_NAMESPACE_OFFICE, XML_CREATE_DATE_STRING, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE_STRING }, - { XML_NAMESPACE_OFFICE, XML_DISPLAY, XML_TOK_TABLE_ANNOTATION_ATTR_DISPLAY }, - { XML_NAMESPACE_SVG, XML_X, XML_TOK_TABLE_ANNOTATION_ATTR_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_TABLE_ANNOTATION_ATTR_Y }, - XML_TOKEN_MAP_END - }; - - pTableAnnotationAttrTokenMap.reset(new SvXMLTokenMap( aTableAnnotationAttrTokenMap )); - } // if( !pTableAnnotationAttrTokenMap ) - - return *pTableAnnotationAttrTokenMap; -} - - void ScXMLImport::SetPostProcessData( sc::ImportPostProcessData* p ) { mpPostProcessData = p; @@ -551,13 +495,11 @@ ScXMLImport::ScXMLImport( ScXMLImport::~ScXMLImport() throw() { // delete pI18NMap; - pTableElemTokenMap.reset(); pTableRowsElemTokenMap.reset(); pTableRowElemTokenMap.reset(); pTableRowAttrTokenMap.reset(); pTableRowCellElemTokenMap.reset(); pTableRowCellAttrTokenMap.reset(); - pTableAnnotationAttrTokenMap.reset(); pChangeTrackingImportHelper.reset(); pNumberFormatAttributesExportHelper.reset(); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index daae1d3a98ed..cb7d3be4b65f 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -219,13 +219,11 @@ class ScXMLImport: public SvXMLImport rtl::Reference < XMLPropertySetMapper > xRowStylesPropertySetMapper; rtl::Reference < XMLPropertySetMapper > xTableStylesPropertySetMapper; - std::unique_ptr pTableElemTokenMap; std::unique_ptr pTableRowsElemTokenMap; std::unique_ptr pTableRowElemTokenMap; std::unique_ptr pTableRowAttrTokenMap; std::unique_ptr pTableRowCellElemTokenMap; std::unique_ptr pTableRowCellAttrTokenMap; - std::unique_ptr pTableAnnotationAttrTokenMap; sc::ImportPostProcessData* mpPostProcessData; /// Lift cycle managed elsewhere, no need to delete. @@ -311,13 +309,11 @@ public: const rtl::Reference < XMLPropertySetMapper >& GetRowStylesPropertySetMapper() const { return xRowStylesPropertySetMapper; } const rtl::Reference < XMLPropertySetMapper >& GetTableStylesPropertySetMapper() const { return xTableStylesPropertySetMapper; } - const SvXMLTokenMap& GetTableElemTokenMap(); const SvXMLTokenMap& GetTableRowsElemTokenMap(); const SvXMLTokenMap& GetTableRowElemTokenMap(); const SvXMLTokenMap& GetTableRowAttrTokenMap(); const SvXMLTokenMap& GetTableRowCellElemTokenMap(); const SvXMLTokenMap& GetTableRowCellAttrTokenMap(); - const SvXMLTokenMap& GetTableAnnotationAttrTokenMap(); void SetPostProcessData( sc::ImportPostProcessData* p ); sc::ImportPostProcessData* GetPostProcessData() { return mpPostProcessData;} -- cgit