summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-03-22 15:47:37 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-03-22 21:49:25 -0400
commitea8ed4dac5390935021b0ca579f33393ac50bd30 (patch)
treeb550987b91a7ef59476382ab243e3f22bb2e1ab6
parent7d6eb60583e05dfa36402c92dc4315f2056f8592 (diff)
ScDBDocFunc is now ScBaseCell-free.
Change-Id: I666886c737b118b30faff6c3763d40c1c4b7fca7
-rw-r--r--sc/source/ui/docshell/dbdocfun.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index a73b238fdcfa..6e9181566d46 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -39,7 +39,6 @@
#include "dpobject.hxx"
#include "dpsave.hxx"
#include "dociter.hxx" // for lcl_EmptyExcept
-#include "cell.hxx" // for lcl_EmptyExcept
#include "editable.hxx"
#include "attrib.hxx"
#include "drwlayer.hxx"
@@ -1179,15 +1178,13 @@ namespace {
bool lcl_EmptyExcept( ScDocument* pDoc, const ScRange& rRange, const ScRange& rExcept )
{
ScCellIterator aIter( pDoc, rRange );
- ScBaseCell* pCell = aIter.GetFirst();
- while (pCell)
+ for (bool bHasCell = aIter.first(); bHasCell; bHasCell = aIter.next())
{
- if ( !pCell->IsBlank() ) // real content?
+ if (!aIter.get().isEmpty()) // real content?
{
if (!rExcept.In(aIter.GetPos()))
return false; // cell found
}
- pCell = aIter.GetNext();
}
return true; // nothing found - empty