[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                               |    3 -
 patches/dev300/calc-perf-filtering-with-notes.diff |   51 ---------------------
 2 files changed, 54 deletions(-)

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

    Removed calc-perf-filtering-with-notes.diff; moved to the split repos.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7bfb898..304ed54 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -503,9 +503,6 @@ calc-string-number.diff, kohei
 # Set reference edge to bottom when importing cells with slanted text.
 calc-xls-import-slanted-border-oox.diff, n#549728, i#38709, kohei
 
-# Speed up filtering performance with notes.
-calc-perf-filtering-with-notes.diff, n#556927, kohei
-
 # import xlsx's Normal cell style into Calc's 'Default' style.
 calc-xlsx-import-default-cellstyle.diff, n#558577, kohei
 
diff --git a/patches/dev300/calc-perf-filtering-with-notes.diff b/patches/dev300/calc-perf-filtering-with-notes.diff
deleted file mode 100644
index fc6369b..0000000
--- a/patches/dev300/calc-perf-filtering-with-notes.diff
+++ /dev/null
@@ -1,51 +0,0 @@
----
- sc/source/core/data/table2.cxx |    4 ----
- sc/source/core/data/table3.cxx |    3 ++-
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index 1ae6cb0..e0a34fa 100644
---- sc/source/core/data/table2.cxx
-+++ sc/source/core/data/table2.cxx
-@@ -2531,8 +2531,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;
-@@ -2572,8 +2570,6 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
-     //	to be done here.
-     if (pOutlineTable)
-         UpdateOutlineRow( nRow1, nRow2, bShow );
--
--    DecRecalcLevel();
- }
- 
- 
-diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
-index c76ca08..013aeea 100644
---- sc/source/core/data/table3.cxx
-+++ sc/source/core/data/table3.cxx
-@@ -1643,6 +1643,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
-@@ -1720,7 +1721,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
-         DBShowRows(nOldStart,nOldEnd, bOldResult);
- 
-     delete[] pSpecial;
--
-+    SetDrawPageSize();
-     return nCount;
- }
- 
--- 
-1.7.0.1
-