summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-10-17 13:10:09 +0200
committerEike Rathke <erack@redhat.com>2012-10-22 15:54:51 +0200
commitc38b67a171615ddc444e0fe849e10d7cada74b6a (patch)
treec2bca5e6b304a1b9f8e58c0569d4263891b181ba
parentd4287fb59bc2bc6cf54fe0ea2786b48ad3afa982 (diff)
only use non blank cells in the visible data methods, fdo#54552
(cherry picked from commit 40377a6e26aa61a1c0788cad1c97a10911d38da8) Signed-off-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 23e6bac62ef6482c287bb0f55c662ac2047ebb33) Change-Id: I2a0914fbaff3e3f707a9c06f693079aed2b89ba4 Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sc/source/core/data/column2.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index c28249a6d827..03f7b5421ac9 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;