summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-06-25 12:39:27 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-06-27 15:47:54 -0400
commit9e79d6d1120b7d96333016725f1a51def7b8d0e7 (patch)
tree5f6f3d421c4f7b569baa31cb6b5d342e57f70260 /sc
parentb17237a7177e39f6611ccfc39e7758dd542f01e0 (diff)
Remove duplicate code blocks.
Change-Id: Ie014ec8866d9e3055a6e67bd20503fc6fc26f503
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/validat.hxx1
-rw-r--r--sc/source/core/inc/interpre.hxx1
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx13
-rw-r--r--sc/source/ui/view/tabview4.cxx11
4 files changed, 2 insertions, 24 deletions
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 85737a3a989f..904279a74fc3 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -29,7 +29,6 @@ namespace ValidListType = ::com::sun::star::sheet::TableValidationVisibility;
class ScPatternAttr;
class ScTokenArray;
class ScTypedStrData;
-class ScCellIterator;
enum ScValidationMode
{
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 4c8dd4b568ef..75947d6ddcaa 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -49,7 +49,6 @@ struct ScComplexRefData;
class ScToken;
class ScJumpMatrix;
-class ScCellIterator;
struct ScRefCellValue;
#define MAXSTACK (4096 / sizeof(formula::FormulaToken*))
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 2b72e894df0e..ac5d4b33e5c2 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2052,18 +2052,7 @@ void ScXMLExport::_ExportAutoStyles()
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB nTab=0; nTab<nTabCount; ++nTab)
if (pDoc->IsStreamValid(nTab))
- {
- ScCellIterator aIter( pDoc, ScRange(0, 0, nTab, MAXCOL, MAXROW, nTab) );
- for (bool bHas = aIter.first(); bHas; bHas = aIter.next())
- {
- if (aIter.getType() != CELLTYPE_FORMULA)
- continue;
-
- ScFormulaCell* pFC = aIter.getFormulaCell();
- if (pFC)
- pFC->IsValue(); // interpret if dirty
- }
- }
+ pDoc->InterpretDirtyCells(ScRange(0, 0, nTab, MAXCOL, MAXROW, nTab));
// stored cell styles
const std::vector<ScCellStyleEntry>& rCellEntries = pSheetData->GetCellStyles();
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 227d3d55bdb9..8140d51650ed 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -506,16 +506,7 @@ void ScTabView::InterpretVisible()
if (nX2 > MAXCOL) nX2 = MAXCOL;
if (nY2 > MAXROW) nY2 = MAXROW;
- ScCellIterator aIter(pDoc, ScRange(nX1, nY1, nTab, nX2, nY2, nTab));
- for (bool bHas = aIter.first(); bHas; bHas = aIter.next())
- {
- if (aIter.getType() != CELLTYPE_FORMULA)
- continue;
-
- ScFormulaCell* p = aIter.getFormulaCell();
- if (p->GetDirty())
- p->Interpret();
- }
+ pDoc->InterpretDirtyCells(ScRange(nX1, nY1, nTab, nX2, nY2, nTab));
}
}