summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-10-14 16:15:05 +0200
committerJens-Heiner Rechtien <hr@openoffice.org>2010-10-14 16:15:05 +0200
commitfcd5e60bd75c32931b8f2fc1bb43ab1fb37b6e15 (patch)
treeb09e733cb3fccf917adbfa402d6e6f9d44527c89
parent92c2e0db5c9d4d0a65048138c3a9fe59a47fa5de (diff)
parent0e506a681fecf457343b34de468859552b1fff5d (diff)
CWS-TOOLING: integrate CWS calc60ooo/OOO330_m12ooo/OOO330_m11
-rw-r--r--sc/source/core/data/table2.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index c4141cce8..765f8316e 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2255,7 +2255,9 @@ BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeig
{
if (pDrawLayer)
{
- unsigned long nOldHeights = GetRowHeight(nStartRow, nEndRow);
+ // #i115025# When comparing to nNewHeight for the whole range, the height
+ // including hidden rows has to be used (same behavior as 3.2).
+ unsigned long nOldHeights = mpRowHeights->getSumValue(nStartRow, nEndRow);
// FIXME: should we test for overflows?
long nHeightDif = (long) (unsigned long) nNewHeight *
(nEndRow - nStartRow + 1) - nOldHeights;