[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/ui/docshell/dbdocfun.cxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d9d50f166770edf6388d9bf8a22a7479f316bf04
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Mar 22 15:47:37 2013 -0400

    ScDBDocFunc is now ScBaseCell-free.
    
    Change-Id: I666886c737b118b30faff6c3763d40c1c4b7fca7

diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index a73b238..6e91815 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