[ooo-build-commit] .: sc/source

[Kohei Yoshida]

 sc/source/core/data/table2.cxx |    4 ----
 sc/source/core/data/table3.cxx |    3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit b0e86d17c246e7201159c222b61f9fa9325bc7b1
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Sep 28 12:25:16 2010 -0400

    Ported calc-perf-filtering-with-notes.diff from ooo-build.

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index a5eb818..61c8ec8 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2635,8 +2635,6 @@ void ScTable::DBShowRow(SCROW nRow, bool bShow)
 void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
 {
     SCROW nStartRow = nRow1;
-    IncRecalcLevel();
-    InitializeNoteCaptions();
     while (nStartRow <= nRow2)
     {
         SCROW nEndRow = -1;
@@ -2676,8 +2674,6 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
     //	to be done here.
     if (pOutlineTable)
         UpdateOutlineRow( nRow1, nRow2, bShow );
-
-    DecRecalcLevel();
 }
 
 
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 3ac8469..7373f25 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1642,6 +1642,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
                             aParam.nDestCol, aParam.nDestRow, aParam.nDestTab );
     }
 
+    InitializeNoteCaptions();
     for (SCROW j=aParam.nRow1 + nHeader; j<=nEndRow; j++)
     {
         BOOL bResult;									// Filterergebnis
@@ -1719,7 +1720,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
         DBShowRows(nOldStart,nOldEnd, bOldResult);
 
     delete[] pSpecial;
-
+    SetDrawPageSize();
     return nCount;
 }