From a7e69f7c2040203f5560c003af779083cd97e10d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 26 Feb 2014 10:41:53 +0200 Subject: [PATCH] remove unused code ScMyNotEmptyCellsIterator::GetCell() const and the consequently unnecessary mpCell field Change-Id: I95061a904bd88daea8c64c9dcfdb2e91f3f3ac3b --- sc/source/filter/xml/XMLExportIterator.cxx | 12 +++--------- sc/source/filter/xml/XMLExportIterator.hxx | 3 --- unusedcode.easy | 1 - 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index afc05fdad835..31d7fdca54be 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -625,7 +625,6 @@ ScMyNotEmptyCellsIterator::ScMyNotEmptyCellsIterator(ScXMLExport& rTempXMLExport pDetectiveObj(NULL), pDetectiveOp(NULL), rExport(rTempXMLExport), - mpCell(NULL), nCurrentTable(SCTAB_MAX) { } @@ -664,9 +663,9 @@ void ScMyNotEmptyCellsIterator::SetCellData( ScMyCell& rMyCell, table::CellAddre if( (nCellCol == rAddress.Column) && (nCellRow == rAddress.Row) ) { - mpCell = mpCellItr->GetNext(nCellCol, nCellRow); - if (mpCell) - rMyCell.maBaseCell = *mpCell; + const ScRefCellValue* pCell = mpCellItr->GetNext(nCellCol, nCellRow); + if (pCell) + rMyCell.maBaseCell = *pCell; } rMyCell.bIsMatrixCovered = false; @@ -815,9 +814,4 @@ bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, ScFormatRangeStyles* pC return bFoundCell; } -const ScRefCellValue* ScMyNotEmptyCellsIterator::GetCell() const -{ - return mpCell; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 857f98c9f118..83380ae3e03d 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -348,7 +348,6 @@ class ScMyNotEmptyCellsIterator : boost::noncopyable ScXMLExport& rExport; boost::scoped_ptr mpCellItr; - const ScRefCellValue* mpCell; SCCOL nCellCol; SCROW nCellRow; @@ -384,8 +383,6 @@ public: void SkipTable(SCTAB nSkip); bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles); - - const ScRefCellValue* GetCell() const; }; #endif diff --git a/unusedcode.easy b/unusedcode.easy index 18bae729e7b4..1a8fa5bec25e 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -80,7 +80,6 @@ ScExtIButton::GetSelected() const ScFlatBoolRowSegments::getValue(int) ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short) ScGridWindow::HasScenarioRange(unsigned short, int, ScRange&) -ScMyNotEmptyCellsIterator::GetCell() const ScVbaFormat::getAddIndent() ScVbaFormat::setAddIndent(com::sun::star::uno::Any const&) SdrItemBrowser::ForceParent()