[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/column2.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit c38b67a171615ddc444e0fe849e10d7cada74b6a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Oct 17 13:10:09 2012 +0200

    only use non blank cells in the visible data methods, fdo#54552
    
    (cherry picked from commit 40377a6e26aa61a1c0788cad1c97a10911d38da8)
    
    Signed-off-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 23e6bac62ef6482c287bb0f55c662ac2047ebb33)
    
    Change-Id: I2a0914fbaff3e3f707a9c06f693079aed2b89ba4
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index c28249a..03f7b54 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1131,7 +1131,8 @@ bool ScColumn::IsEmptyVisData() const
         SCSIZE i;
         for (i=0; i<maItems.size() && !bVisData; i++)
         {
-            bVisData = true;
+            if(!maItems[i].pCell->IsBlank())
+                bVisData = true;
         }
         return !bVisData;
     }
@@ -1165,8 +1166,11 @@ SCROW ScColumn::GetLastVisDataPos() const
         for (i=maItems.size(); i>0 && !bFound; )
         {
             --i;
-            bFound = true;
-            nRet = maItems[i].nRow;
+            if(!maItems[i].pCell->IsBlank())
+            {
+                bFound = true;
+                nRet = maItems[i].nRow;
+            }
         }
     }
     return nRet;