diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-13 09:35:05 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-13 10:26:35 +0100 |
commit | ead34a4d34db05d5718d96b66f5e39d886c8b699 (patch) | |
tree | 9748f73bd8664b529bdbddbf8c6dd5b8e96d6100 /sc/source | |
parent | 26b7ff2b6cc4def8ff7b02e223961534ba88e654 (diff) |
no need to store reference to Import here
can just cast the parent member
Change-Id: I990bd4da3afbd78da819038c7907c28de87faaaf
Reviewed-on: https://gerrit.libreoffice.org/82567
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/filter/xml/xmlexternaltabi.cxx | 10 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexternaltabi.hxx | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 8d0a810dad09..5515fd835ba5 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -43,7 +43,6 @@ ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList, ScXMLExternalTabData& rRefInfo ) : ScXMLImportContext( rImport ), - mrScImport(rImport), mrExternalRefInfo(rRefInfo) { using namespace ::xmloff::token; @@ -98,7 +97,7 @@ static bool lcl_isValidRelativeURL(const OUString& rUrl) void SAL_CALL ScXMLExternalRefTabSourceContext::endFastElement( sal_Int32 /*nElement*/ ) { - ScDocument* pDoc = mrScImport.GetDocument(); + ScDocument* pDoc = GetScImport().GetDocument(); if (!pDoc) return; @@ -111,7 +110,6 @@ void SAL_CALL ScXMLExternalRefTabSourceContext::endFastElement( sal_Int32 /*nEle ScXMLExternalRefRowsContext::ScXMLExternalRefRowsContext( ScXMLImport& rImport, ScXMLExternalTabData& rRefInfo ) : ScXMLImportContext( rImport ), - mrScImport(rImport), mrExternalRefInfo(rRefInfo) { } @@ -126,7 +124,7 @@ Reference< XFastContextHandler > SAL_CALL ScXMLExternalRefRowsContext::createFas // #i101319# row elements inside group, rows or header-rows // are treated like row elements directly in the table element - const SvXMLTokenMap& rTokenMap = mrScImport.GetTableRowsElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetScImport().GetTableRowsElemTokenMap(); sal_uInt16 nToken = rTokenMap.Get( nElement ); sax_fastparser::FastAttributeList *pAttribList = sax_fastparser::FastAttributeList::castToFastAttributeList( xAttrList ); @@ -137,10 +135,10 @@ Reference< XFastContextHandler > SAL_CALL ScXMLExternalRefRowsContext::createFas case XML_TOK_TABLE_ROWS_HEADER_ROWS: case XML_TOK_TABLE_ROWS_ROWS: return new ScXMLExternalRefRowsContext( - mrScImport, mrExternalRefInfo); + GetScImport(), mrExternalRefInfo); case XML_TOK_TABLE_ROWS_ROW: return new ScXMLExternalRefRowContext( - mrScImport, pAttribList, mrExternalRefInfo); + GetScImport(), pAttribList, mrExternalRefInfo); default: ; } diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 08e3fb2d2686..5afb5c5f9bfc 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -40,7 +40,6 @@ public: virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override; private: - ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; OUString maRelativeUrl; @@ -61,7 +60,6 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; private: - ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; }; |