diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-28 11:27:22 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-29 14:45:29 +0200 |
commit | eb754cf5f36a7730672a72e198cf564b7e05fa3c (patch) | |
tree | 6860e8655935d3fab6d992b6379648b27ca8ec8b /sc | |
parent | 17c936bca548acc93d6b2e70593bc711c0e6b8a4 (diff) |
loplugin:unusedfields-in-constructor in sc
Change-Id: I074bb272b692dea553e1ec1e625c8afd766627d6
Reviewed-on: https://gerrit.libreoffice.org/54997
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/columniterator.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/columniterator.cxx | 15 | ||||
-rw-r--r-- | sc/source/core/data/dpoutput.cxx | 16 | ||||
-rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 7 | ||||
-rw-r--r-- | sc/source/filter/excel/xiname.cxx | 14 | ||||
-rw-r--r-- | sc/source/filter/inc/orcusinterface.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/inc/xestyle.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/inc/xiname.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/orcus/interface.cxx | 1 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlcondformat.cxx | 7 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlcondformat.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlcvali.cxx | 3 | ||||
-rw-r--r-- | sc/source/filter/xml/xmldpimp.cxx | 25 | ||||
-rw-r--r-- | sc/source/filter/xml/xmldpimp.hxx | 10 | ||||
-rw-r--r-- | sc/source/filter/xml/xmldrani.cxx | 10 | ||||
-rw-r--r-- | sc/source/filter/xml/xmldrani.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexternaltabi.cxx | 3 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexternaltabi.hxx | 1 |
18 files changed, 42 insertions, 79 deletions
diff --git a/sc/inc/columniterator.hxx b/sc/inc/columniterator.hxx index b36a4c7028b2..c964e0ccb9c9 100644 --- a/sc/inc/columniterator.hxx +++ b/sc/inc/columniterator.hxx @@ -22,7 +22,6 @@ struct ScRefCellValue; class ScColumnTextWidthIterator { - sc::CellTextAttrStoreType& mrCellTextAttrs; const size_t mnEnd; size_t mnCurPos; sc::CellTextAttrStoreType::iterator miBlockCur; diff --git a/sc/source/core/data/columniterator.cxx b/sc/source/core/data/columniterator.cxx index f7367193d9cb..819f8466768d 100644 --- a/sc/source/core/data/columniterator.cxx +++ b/sc/source/core/data/columniterator.cxx @@ -15,22 +15,21 @@ #include <osl/diagnose.h> ScColumnTextWidthIterator::ScColumnTextWidthIterator(ScColumn& rCol, SCROW nStartRow, SCROW nEndRow) : - mrCellTextAttrs(rCol.maCellTextAttrs), mnEnd(static_cast<size_t>(nEndRow)), - mnCurPos(0), - miBlockCur(mrCellTextAttrs.begin()), - miBlockEnd(mrCellTextAttrs.end()) + mnCurPos(0) { + miBlockCur = rCol.maCellTextAttrs.begin(); + miBlockEnd = rCol.maCellTextAttrs.end(); init(nStartRow, nEndRow); } ScColumnTextWidthIterator::ScColumnTextWidthIterator(ScDocument& rDoc, const ScAddress& rStartPos, SCROW nEndRow) : - mrCellTextAttrs(rDoc.maTabs[rStartPos.Tab()]->aCol[rStartPos.Col()].maCellTextAttrs), mnEnd(static_cast<size_t>(nEndRow)), - mnCurPos(0), - miBlockCur(mrCellTextAttrs.begin()), - miBlockEnd(mrCellTextAttrs.end()) + mnCurPos(0) { + auto & rCellTextAttrs = rDoc.maTabs[rStartPos.Tab()]->aCol[rStartPos.Col()].maCellTextAttrs; + miBlockCur = rCellTextAttrs.begin(); + miBlockEnd = rCellTextAttrs.end(); init(rStartPos.Row(), nEndRow); } diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 3b15dd30d616..bcf1559c58bd 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -81,18 +81,16 @@ struct ScDPOutLevelData uno::Sequence<sheet::MemberResult> maResult; OUString maName; /// Name is the internal field name. OUString maCaption; /// Caption is the name visible in the output table. - double mfValue; /// Value is the underlying numeric value, if any, or NaN bool mbHasHiddenMember:1; bool mbDataLayout:1; bool mbPageDim:1; ScDPOutLevelData(long nDim, long nHier, long nLevel, long nDimPos, sal_uInt32 nSrcNumFmt, const uno::Sequence<sheet::MemberResult> &aResult, - const OUString &aName, const OUString &aCaption, double fValue, bool bHasHiddenMember, bool bDataLayout, bool bPageDim) : + const OUString &aName, const OUString &aCaption, bool bHasHiddenMember, bool bDataLayout, bool bPageDim) : mnDim(nDim), mnHier(nHier), mnLevel(nLevel), mnDimPos(nDimPos), mnSrcNumFmt(nSrcNumFmt), maResult(aResult), - maName(aName), maCaption(aCaption), mfValue(fValue), mbHasHiddenMember(bHasHiddenMember), mbDataLayout(bDataLayout), + maName(aName), maCaption(aCaption), mbHasHiddenMember(bHasHiddenMember), mbDataLayout(bDataLayout), mbPageDim(bPageDim) { - rtl::math::setNan(&mfValue); } // bug (73840) in uno::Sequence - copy and then assign doesn't work! @@ -595,10 +593,6 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS OUString aCaption = ScUnoHelpFunctions::GetStringProperty( xPropSet, SC_UNO_DP_LAYOUTNAME, aName ); - /* TODO: any numeric value to obtain? */ - double fValue; - rtl::math::setNan(&fValue); - switch ( eDimOrient ) { case sheet::DataPilotFieldOrientation_COLUMN: @@ -607,7 +601,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS if (!lcl_MemberEmpty(aResult)) { ScDPOutLevelData tmp(nDim, nHierarchy, nLev, nDimPos, nNumFmt, aResult, aName, - aCaption, fValue, bHasHiddenMember, bIsDataLayout, false); + aCaption, bHasHiddenMember, bIsDataLayout, false); pColFields.push_back(tmp); } } @@ -618,7 +612,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS if (!lcl_MemberEmpty(aResult)) { ScDPOutLevelData tmp(nDim, nHierarchy, nLev, nDimPos, nNumFmt, aResult, aName, - aCaption, fValue, bHasHiddenMember, bIsDataLayout, false); + aCaption, bHasHiddenMember, bIsDataLayout, false); pRowFields.push_back(tmp); } } @@ -628,7 +622,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS uno::Sequence<sheet::MemberResult> aResult = getVisiblePageMembersAsResults(xLevel); // no check on results for page fields ScDPOutLevelData tmp(nDim, nHierarchy, nLev, nDimPos, nNumFmt, aResult, aName, - aCaption, fValue, bHasHiddenMember, false, true); + aCaption, bHasHiddenMember, false, true); pPageFields.push_back(tmp); } break; diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 746cad084b16..050eaa850c30 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2974,10 +2974,11 @@ void XclExpXFBuffer::AddBorderAndFill( const XclExpXF& rXF ) XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), - mxFormatter( new SvNumberFormatter( comphelper::getProcessComponentContext(), LANGUAGE_ENGLISH_US ) ), mpKeywordTable( new NfKeywordTable ) { - mxFormatter->FillKeywordTableForExcel( *mpKeywordTable ); + // Special number formatter for conversion. + SvNumberFormatterPtr xFormatter(new SvNumberFormatter( comphelper::getProcessComponentContext(), LANGUAGE_ENGLISH_US )); + xFormatter->FillKeywordTableForExcel( *mpKeywordTable ); SCTAB nTables = rRoot.GetDoc().GetTableCount(); for(SCTAB nTab = 0; nTab < nTables; ++nTab) @@ -3055,7 +3056,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) { sal_uInt32 nScNumFmt = static_cast< const SfxUInt32Item* >(pPoolItem)->GetValue(); sal_Int32 nXclNumFmt = GetRoot().GetNumFmtBuffer().Insert(nScNumFmt); - pNumFormat = new XclExpNumFmt( nScNumFmt, nXclNumFmt, GetNumberFormatCode( *this, nScNumFmt, mxFormatter.get(), mpKeywordTable.get() )); + pNumFormat = new XclExpNumFmt( nScNumFmt, nXclNumFmt, GetNumberFormatCode( *this, nScNumFmt, xFormatter.get(), mpKeywordTable.get() )); } maDxf.push_back(o3tl::make_unique<XclExpDxf>( rRoot, pAlign, pBorder, pFont, pNumFormat, pCellProt, pColor )); diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 12e6ba3e91f8..64dcfdfdfdc6 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -34,7 +34,6 @@ XclImpName::TokenStrmData::TokenStrmData( XclImpStream& rStrm ) : XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : XclImpRoot( rStrm.GetRoot() ), mpScData( nullptr ), - mcBuiltIn( EXC_BUILTIN_UNKNOWN ), mnScTab( SCTAB_MAX ), meNameType( ScRangeData::Type::Name ), mnXclTab( EXC_NAME_GLOBAL ), @@ -49,6 +48,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : sal_uInt16 nFlags = 0, nFmlaSize = 0, nExtSheet = EXC_NAME_GLOBAL; sal_uInt8 nNameLen = 0; + sal_Unicode cBuiltIn(EXC_BUILTIN_UNKNOWN); /// Excel built-in name index. switch( GetBiff() ) { @@ -122,10 +122,10 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : { // built-in name if( !maXclName.isEmpty() ) - mcBuiltIn = maXclName[0]; - if( mcBuiltIn == '?' ) // NUL character is imported as '?' - mcBuiltIn = '\0'; - maScName = XclTools::GetBuiltInDefName( mcBuiltIn ); + cBuiltIn = maXclName[0]; + if( cBuiltIn == '?' ) // NUL character is imported as '?' + cBuiltIn = '\0'; + maScName = XclTools::GetBuiltInDefName( cBuiltIn ); } else { @@ -157,7 +157,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : // --- print ranges or title ranges --- rStrm.PushPosition(); - switch( mcBuiltIn ) + switch( cBuiltIn ) { case EXC_BUILTIN_PRINTAREA: if( rFmlaConv.Convert( GetPrintAreaBuffer(), rStrm, nFmlaSize, nLocalTab, FT_RangeName ) == ConvErr::OK ) @@ -181,7 +181,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : ScRange aRange; if (pTokArr->IsReference(aRange, ScAddress())) { - switch( mcBuiltIn ) + switch( cBuiltIn ) { case EXC_BUILTIN_FILTERDATABASE: GetFilterManager().Insert( &GetOldRoot(), aRange); diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index d1b4cfb5e6b1..69773d557029 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -556,7 +556,6 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory CellStoreTokensType maCellStoreTokens; ScOrcusGlobalSettings maGlobalSettings; - ScOrcusRefResolver maRefResolver; ScOrcusSharedStrings maSharedStrings; ScOrcusNamedExpression maNamedExpressions; std::vector<std::unique_ptr<ScOrcusSheet>> maSheets; diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index dc12247b418f..81df0c6daed4 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -726,7 +726,6 @@ private: typedef std::vector< std::unique_ptr<XclExpDxf> > DxfContainer; std::map<OUString, sal_Int32> maStyleNameToDxfId; DxfContainer maDxf; - SvNumberFormatterPtr mxFormatter; /// Special number formatter for conversion. std::unique_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table. }; diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index be0f9bdc09dc..a9a9cdf12bf9 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -66,7 +66,6 @@ private: OUString maXclName; /// Original name read from the file. OUString maScName; /// Name inserted into the Calc document. const ScRangeData* mpScData; /// Pointer to Calc defined name (no ownership). - sal_Unicode mcBuiltIn; /// Excel built-in name index. SCTAB mnScTab; /// Calc sheet index of local names. ScRangeData::Type meNameType; sal_uInt16 mnXclTab; diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index 6dcf6600095c..e838bf5c75a3 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -227,7 +227,6 @@ ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress& rPos, const OUSt ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc) : maDoc(rDoc), maGlobalSettings(maDoc), - maRefResolver(maGlobalSettings), maSharedStrings(*this), maNamedExpressions(maDoc, maGlobalSettings), maStyles(rDoc), diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 54b3b3deea77..deb34ec4e596 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -397,7 +397,6 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList, ScConditionalFormat* pFormat): ScXMLImportContext( rImport ), - mpDataBarFormat(nullptr), mpFormatData(nullptr), mnIndex(0) { @@ -446,9 +445,9 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, } } - mpDataBarFormat = new ScDataBarFormat(rImport.GetDocument()); + ScDataBarFormat* pDataBarFormat = new ScDataBarFormat(rImport.GetDocument()); mpFormatData = new ScDataBarFormatData(); - mpDataBarFormat->SetDataBarData(mpFormatData); + pDataBarFormat->SetDataBarData(mpFormatData); if(!sGradient.isEmpty()) { bool bGradient = true; @@ -505,7 +504,7 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, mpFormatData->mnMaxLength = nVal; } - pFormat->AddEntry(mpDataBarFormat); + pFormat->AddEntry(pDataBarFormat); } css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLDataBarFormatContext::createFastChildContext( diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index fc78b54b02e4..35d9c9ef8518 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -101,7 +101,6 @@ public: sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; private: - ScDataBarFormat* mpDataBarFormat; ScDataBarFormatData* mpFormatData; sal_Int32 mnIndex; diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index a9232502b920..69473160ecee 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -122,7 +122,6 @@ public: class ScXMLErrorMacroContext : public ScXMLImportContext { - OUString sName; bool bExecute; ScXMLContentValidationContext* pValidationContext; @@ -562,7 +561,6 @@ ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList, ScXMLContentValidationContext* pTempValidationContext) : ScXMLImportContext( rImport ), - sName(), bExecute(false) { pValidationContext = pTempValidationContext; @@ -573,7 +571,6 @@ ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, switch (aIter.getToken()) { case XML_ELEMENT( TABLE, XML_NAME ): - sName = aIter.toString(); break; case XML_ELEMENT( TABLE, XML_EXECUTE ): bExecute = IsXMLToken(aIter, XML_TRUE); diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 0c4b583ca598..8d7c731d43e7 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -575,9 +575,8 @@ void ScXMLDataPilotTableContext::SetGrandTotal( ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : - ScXMLImportContext( rImport ), - pDataPilotTable(pTempDataPilotTable) + ScXMLDataPilotTableContext* pDataPilotTable) : + ScXMLImportContext( rImport ) { if ( rAttrList.is() ) { @@ -605,9 +604,8 @@ ScXMLDPSourceSQLContext::~ScXMLDPSourceSQLContext() ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : - ScXMLImportContext( rImport ), - pDataPilotTable(pTempDataPilotTable) + ScXMLDataPilotTableContext* pDataPilotTable) : + ScXMLImportContext( rImport ) { if ( rAttrList.is() ) { @@ -633,9 +631,8 @@ ScXMLDPSourceTableContext::~ScXMLDPSourceTableContext() ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : - ScXMLImportContext( rImport ), - pDataPilotTable(pTempDataPilotTable) + ScXMLDataPilotTableContext* pDataPilotTable) : + ScXMLImportContext( rImport ) { if ( rAttrList.is() ) { @@ -660,9 +657,8 @@ ScXMLDPSourceQueryContext::~ScXMLDPSourceQueryContext() ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : - ScXMLImportContext( rImport ), - pDataPilotTable(pTempDataPilotTable) + ScXMLDataPilotTableContext* pDataPilotTable) : + ScXMLImportContext( rImport ) { if ( rAttrList.is() ) { @@ -1288,9 +1284,8 @@ void ScXMLDataPilotSubTotalsContext::SetDisplayName(const OUString& rName) ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList, - ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) : - ScXMLImportContext( rImport ), - pDataPilotSubTotals(pTempDataPilotSubTotals) + ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals) : + ScXMLImportContext( rImport ) { if ( rAttrList.is() ) { diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index df8b2f279ae9..536a90d06557 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -145,8 +145,6 @@ public: class ScXMLDPSourceSQLContext : public ScXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; - public: ScXMLDPSourceSQLContext( ScXMLImport& rImport, @@ -158,8 +156,6 @@ public: class ScXMLDPSourceTableContext : public ScXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; - public: ScXMLDPSourceTableContext( ScXMLImport& rImport, @@ -171,8 +167,6 @@ public: class ScXMLDPSourceQueryContext : public ScXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; - public: ScXMLDPSourceQueryContext( ScXMLImport& rImport, @@ -184,8 +178,6 @@ public: class ScXMLSourceServiceContext : public ScXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; - public: ScXMLSourceServiceContext( ScXMLImport& rImport, @@ -382,8 +374,6 @@ public: class ScXMLDataPilotSubTotalContext : public ScXMLImportContext { - ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals; - public: ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index a323762d5c1b..4a90fca5366d 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -609,9 +609,8 @@ void SAL_CALL ScXMLSourceQueryContext::endFastElement( sal_Int32 /*nElement*/ ) ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : - ScXMLImportContext( rImport ), - pDatabaseRangeContext( pTempDatabaseRangeContext ) + ScXMLDatabaseRangeContext* pDatabaseRangeContext) : + ScXMLImportContext( rImport ) { OUString sConRes; if ( rAttrList.is() ) @@ -687,9 +686,8 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLSubTotalRulesConte ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : - ScXMLImportContext( rImport ), - pDatabaseRangeContext(pTempDatabaseRangeContext) + ScXMLDatabaseRangeContext* pDatabaseRangeContext) : + ScXMLImportContext( rImport ) { pDatabaseRangeContext->SetSubTotalsSortGroups(true); if ( rAttrList.is() ) diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 9cc5a2635924..de6f0c6cd7ec 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -179,8 +179,6 @@ public: class ScXMLConResContext : public ScXMLImportContext { - ScXMLDatabaseRangeContext* pDatabaseRangeContext; - public: ScXMLConResContext( ScXMLImport& rImport, @@ -208,8 +206,6 @@ public: class ScXMLSortGroupsContext : public ScXMLImportContext { - ScXMLDatabaseRangeContext* pDatabaseRangeContext; - public: ScXMLSortGroupsContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 9e5c9a746804..5cd76da70c1e 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -58,7 +58,8 @@ ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext( if ( nAttrToken == XML_ELEMENT( XLINK, XML_HREF ) ) maRelativeUrl = it.toString(); else if ( nAttrToken == XML_ELEMENT( TABLE, XML_TABLE_NAME ) ) - maTableName = it.toString(); + // todo + ; else if ( nAttrToken == XML_ELEMENT( TABLE, XML_FILTER_NAME ) ) maFilterName = it.toString(); else if ( nAttrToken == XML_ELEMENT( TABLE, XML_FILTER_OPTIONS ) ) diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 88ef648c6f20..3892f9ead0f2 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -43,7 +43,6 @@ private: ScXMLExternalTabData& mrExternalRefInfo; OUString maRelativeUrl; - OUString maTableName; OUString maFilterName; OUString maFilterOptions; }; |