[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-perf-filtering-with-notes.diff |   56 +++++++++++++++------
 1 file changed, 41 insertions(+), 15 deletions(-)

New commits:
commit 3e9fa1c84aed1ef176394ec09608b4ae7e0a24a8
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Nov 25 15:27:30 2009 -0500

    Slightly changed it, to play it safe.
    
    * patches/dev300/calc-perf-filtering-with-notes.diff: leave the
      recalc level guard intact but use a boolean parameter to disable
      draw page size reset.

diff --git a/patches/dev300/calc-perf-filtering-with-notes.diff b/patches/dev300/calc-perf-filtering-with-notes.diff
index 88b3aa7..2e5ae6a 100644
--- a/patches/dev300/calc-perf-filtering-with-notes.diff
+++ b/patches/dev300/calc-perf-filtering-with-notes.diff
@@ -1,31 +1,57 @@
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index c6c41f1..c7836c5 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -638,7 +638,7 @@ public:
+     void		DBShowRow(SCROW nRow, BOOL bShow);
+ 
+     void		ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow);
+-    void		DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow);
++    void		DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow, bool bDrawPageSize);
+ 
+     void		SetColFlags( SCCOL nCol, BYTE nNewFlags );
+     void		SetRowFlags( SCROW nRow, BYTE nNewFlags );
 diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index c3ee408..86e9e1d 100644
+index 319a7e5..f0a0815 100644
 --- sc/source/core/data/table2.cxx
 +++ sc/source/core/data/table2.cxx
-@@ -2500,8 +2500,7 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow)
- void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
+@@ -2540,7 +2540,7 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow)
+ }
+ 
+ 
+-void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
++void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow, bool bDrawPageSize)
  {
      SCROW nStartRow = nRow1;
--    nRecalcLvl++;
-     InitializeNoteCaptions();
-     while (nStartRow <= nRow2)
-     {
-         SCROW nEndRow = -1;
-@@ -2540,9 +2539,6 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
-     //	to be done here.
+     nRecalcLvl++;
+@@ -2585,7 +2585,7 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
      if (pOutlineTable)
          UpdateOutlineRow( nRow1, nRow2, bShow );
--
+ 
 -    if( !--nRecalcLvl )
--        SetDrawPageSize();
++    if( !--nRecalcLvl && bDrawPageSize)
+         SetDrawPageSize();
  }
  
- 
 diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
-index 6da3d50..20b4f49 100644
+index 52d7d32..7c9af91 100644
 --- sc/source/core/data/table3.cxx
 +++ sc/source/core/data/table3.cxx
-@@ -1648,6 +1648,8 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
+@@ -1668,7 +1668,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
+             else
+             {
+                 if (bStarted)
+-                    DBShowRows(nOldStart,nOldEnd, bOldResult);
++                    DBShowRows(nOldStart,nOldEnd, bOldResult, false);
+                 nOldStart = nOldEnd = j;
+                 bOldResult = bResult;
+             }
+@@ -1687,10 +1687,12 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
+     }
+ 
+     if (aParam.bInplace && bStarted)
+-        DBShowRows(nOldStart,nOldEnd, bOldResult);
++        DBShowRows(nOldStart,nOldEnd, bOldResult, false);
  
      delete[] pSpecial;