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

[Kohei Yoshida]

 patches/dev300/apply                                    |    4 -
 patches/dev300/calc-perf-rowheight-no-progress-bar.diff |   38 ----------------
 2 files changed, 42 deletions(-)

New commits:
commit 468dc4e470c786d88fbfcd5fd26954b7fcdbcafa
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Sep 28 15:01:25 2010 -0400

    Removed calc-perf-rowheight-no-progress-bar.diff; moved to the split repos.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ec095e5..b50e29b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -514,10 +514,6 @@ calc-xlsx-import-default-cellstyle.diff, n#558577, kohei
 # The work to increase Calc's row size limit, and any work associated with it.
 SectionOwner => kohei
 
-# don't show progress bar during row height adjustment if the row count is
-# less than 1000.
-calc-perf-rowheight-no-progress-bar.diff, n#514156, kohei
-
 # correctly export the heights of rows with wrapped text.
 calc-xls-export-row-height-wrapped-text.diff, n#580094, kohei
 
diff --git a/patches/dev300/calc-perf-rowheight-no-progress-bar.diff b/patches/dev300/calc-perf-rowheight-no-progress-bar.diff
deleted file mode 100644
index 3770772..0000000
--- a/patches/dev300/calc-perf-rowheight-no-progress-bar.diff
+++ /dev/null
@@ -1,38 +0,0 @@
----
- sc/source/core/data/table1.cxx |   19 ++++++++++++++-----
- 1 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx
-index a65af1a..84ce01c 100644
---- sc/source/core/data/table1.cxx
-+++ sc/source/core/data/table1.cxx
-@@ -353,12 +353,21 @@ BOOL ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
-     BOOL    bChanged = FALSE;
-     SCSIZE  nCount = static_cast<SCSIZE>(nEndRow-nStartRow+1);
- 
-+    ULONG nTotalCount = GetWeightedCount();
-     ScProgress* pProgress = NULL;
--    if ( pOuterProgress )
--        pProgress = pOuterProgress;
--    else if ( nCount > 1 )
--        pProgress = new ScProgress( pDocument->GetDocumentShell(),
--                            ScGlobal::GetRscString(STR_PROGRESS_HEIGHTING), GetWeightedCount() );
-+    if (nTotalCount >= 1000)
-+    {
-+        // if the total number of rows is less than 1000, don't even bother
-+        // with the progress bar because drawing progress bar can be very
-+        // expensive especially in GTK.
-+
-+        if ( pOuterProgress )
-+            pProgress = pOuterProgress;
-+        else if ( nCount > 1 )
-+            pProgress = new ScProgress(
-+                pDocument->GetDocumentShell(),
-+                ScGlobal::GetRscString(STR_PROGRESS_HEIGHTING), nTotalCount );
-+    }
- 
-     USHORT* pHeight = new USHORT[nCount];                   // Twips !
-     memset( pHeight, 0, sizeof(USHORT) * nCount );
--- 
-1.7.0.1
-