[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/core/data/table2.cxx    |    6 ------
 sc/source/ui/docshell/docfunc.cxx |    4 ++--
 sc/source/ui/view/viewfunc.cxx    |    3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 673f70f40d1c2745327b179a6cee235ca73a11d6
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Feb 15 17:33:06 2011 -0500

    Remove this weird recalc level construct.  Let's keep it simple.

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 7648647..7b7d80a 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2108,11 +2108,7 @@ void ScTable::SetRowHeight( SCROW nRow, USHORT nNewHeight )
         sal_uInt16 nOldHeight = mpRowHeights->getValue(nRow);
         if ( nNewHeight != nOldHeight )
         {
-            IncRecalcLevel();
-            InitializeNoteCaptions();
             mpRowHeights->setValue(nRow, nRow, nNewHeight);
-            DecRecalcLevel();
-
             InvalidatePageBreaks();
         }
     }
@@ -2162,8 +2158,6 @@ BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeig
     BOOL bChanged = FALSE;
     if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && mpRowHeights)
     {
-        IncRecalcLevel();
-        InitializeNoteCaptions();
         if (!nNewHeight)
         {
             DBG_ERROR("Zeilenhoehe 0 in SetRowHeight");
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 50054ec..6cf4068 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3170,7 +3170,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
     BOOL bShow = nSizeTwips > 0 || eMode != SC_SIZE_DIRECT;
     BOOL bOutline = FALSE;
 
-    pDoc->IncSizeRecalcLevel( nTab );		// nicht fuer jede Spalte einzeln
+    pDoc->InitializeNoteCaptions(nTab);
     for (SCCOLROW nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
     {
         SCCOLROW nStartNo = *(pRanges++);
@@ -3255,7 +3255,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
                         static_cast<SCROW>(nEndNo), nTab, bShow );
         }
     }
-    pDoc->DecSizeRecalcLevel( nTab );		// nicht fuer jede Spalte einzeln
+    pDoc->SetDrawPageSize(nTab);
 
     if (!bOutline)
         DELETEZ(pUndoTab);
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index ab639ef..7ef09be 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2203,7 +2203,6 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
         {
             const SCCOLROW* pTabRanges = pRanges;
 
-            pDoc->IncSizeRecalcLevel( nTab );		// nicht fuer jede Spalte einzeln
             pDoc->InitializeNoteCaptions( nTab );
             for (SCCOLROW nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
             {
@@ -2301,7 +2300,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
                         bOutline = TRUE;
                 }
             }
-            pDoc->DecSizeRecalcLevel( nTab );		// nicht fuer jede Spalte einzeln
+            pDoc->SetDrawPageSize(nTab);
         }