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
commit62d7a41f8488af493968d38fe9a7f3a018366a57 (patch)
tree4089d8263454d14dbc2abbe567790a96a7c7b304
parent965f693fd736350d997e7f40dda720ce2e016149 (diff)
parent94d4cf1aff5eb0d9af319d1671daa3d801e22265 (diff)
CWS-TOOLING: integrate CWS calc60
Notes
split repo tag: calc_ooo/OOO330_m11 split repo tag: calc_ooo/OOO330_m12
-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 4223c05c4f83..9bb22b68d2ad 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;