[Libreoffice-commits] .: 3 commits - sc/source

[Jan Holesovsky]

 sc/source/core/data/table2.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 61f44441e91938dde4a71ccc610df0ce3c3ba3d0
Merge: 57b695a... fcd5e60...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Sun Oct 24 15:36:37 2010 +0200

    Merge commit 'ooo/OOO330_m12'

commit fcd5e60bd75c32931b8f2fc1bb43ab1fb37b6e15
Merge: 92c2e0d... 0e506a6...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Thu Oct 14 16:15:05 2010 +0200

    CWS-TOOLING: integrate CWS calc60

commit 0e506a681fecf457343b34de468859552b1fff5d
Author: Niklas Nebel <nn at openoffice.org>
Date:   Wed Oct 13 13:34:07 2010 +0200

    calc60: #i115025# SetRowHeightRange: compare height directly to mpRowHeights sum value

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index c4141cc..765f831 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;