[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                 |    3 -
 patches/dev300/calc-autofilter-shrink-selection.diff |   11 ++--
 patches/dev300/calc-less-formula-progress.diff       |   48 -------------------
 3 files changed, 6 insertions(+), 56 deletions(-)

New commits:
commit ef771d38cf6063c034b366469662b73a26bf8448
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 15:35:44 2009 +0300

    Adapt calc-autofilter-shrink-selection.diff for dev300-m54
    
    * patches/dev300/calc-autofilter-shrink-selection.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/calc-autofilter-shrink-selection.diff b/patches/dev300/calc-autofilter-shrink-selection.diff
index 015ec6a..2b5d023 100644
--- a/patches/dev300/calc-autofilter-shrink-selection.diff
+++ b/patches/dev300/calc-autofilter-shrink-selection.diff
@@ -79,17 +79,18 @@ diff --git sc/source/ui/view/dbfunc.cxx sc/source/ui/view/dbfunc.cxx
 index b985912..ce3dede 100644
 --- sc/source/ui/view/dbfunc.cxx
 +++ sc/source/ui/view/dbfunc.cxx
-@@ -108,13 +108,29 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
+@@ -108,14 +108,30 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
  
  //	aktuellen Datenbereich fuer Sortieren / Filtern suchen
  
 -ScDBData* ScDBFunc::GetDBData( bool bMark, ScGetDBMode eMode, bool bExpandRows )
 +ScDBData* ScDBFunc::GetDBData( bool bMark, ScGetDBMode eMode, bool bExpandRows, bool bShrinkToData )
  {
-     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-     ScDBData* pData = NULL;
-     ScRange aRange;
-     if ( GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE )
+ 	ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ 	ScDBData* pData = NULL;
+ 	ScRange aRange;
+ 	ScMarkType eMarkType = GetViewData()->GetSimpleArea(aRange);
+ 	if ( eMarkType == SC_MARK_SIMPLE || eMarkType == SC_MARK_SIMPLE_FILTERED )
 +    {
 +        if (bShrinkToData)
 +        {
commit 0b13474ec0e3a12ca3536a5ea6709542fc676091
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 15:28:41 2009 +0300

    calc-less-formula-progress.diff is upstream
    
    * patches/dev300/calc-less-formula-progress.diff: Has been
      upstreamed. Delete.
    * patches/dev300/apply: Drop it from here.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d7dd903..5f1780e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1960,9 +1960,6 @@ calc-selection-fixed-cursor.diff, n#502717, i#102151, kohei
 # show cursor in non-active panes, instead of ugly black box.
 calc-cursor-split-view.diff, n#433834, kohei
 
-# update progress bar less frequently during formula calculation.
-calc-less-formula-progress.diff, i#102566, kohei
-
 # shrink selection to data area before setting autofilter.
 calc-autofilter-shrink-selection.diff, n#514164, kohei
 
diff --git a/patches/dev300/calc-less-formula-progress.diff b/patches/dev300/calc-less-formula-progress.diff
deleted file mode 100644
index b74b05e..0000000
--- a/patches/dev300/calc-less-formula-progress.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git sc/inc/progress.hxx sc/inc/progress.hxx
-index 0e7f545..7e9bb7c 100644
---- sc/inc/progress.hxx
-+++ sc/inc/progress.hxx
-@@ -36,6 +36,17 @@
- 
- class ScDocument;
- 
-+/*
-+ * #i102566
-+ * Drawing a progress bar update is not cheap, so if we draw it on every
-+ * percentage change of 200 calculations we get one progress draw per 2
-+ * calculations which is slower than doing the calculations themselves. So as a
-+ * rough guide only do an update per MIN_NO_CODES_PER_PROGRESS_UPDATE
-+ * calculations
-+ */
-+#define MIN_NO_CODES_PER_PROGRESS_UPDATE 100
-+
-+
- class SC_DLLPUBLIC ScProgress
- {
- private:
-diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx
-index cb9cf80..7e5f291 100644
---- sc/source/core/data/cell.cxx
-+++ sc/source/core/data/cell.cxx
-@@ -1724,7 +1724,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
- 
-         // Reschedule verlangsamt das ganze erheblich, nur bei Prozentaenderung ausfuehren
-         ScProgress::GetInterpretProgress()->SetStateCountDownOnPercent(
--            pDocument->GetFormulaCodeInTree() );
-+            pDocument->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE );
- 
-         switch (p->GetVolatileType())
-         {
-diff --git sc/source/core/tool/progress.cxx sc/source/core/tool/progress.cxx
-index 66e1391..3d0e62c 100644
---- sc/source/core/tool/progress.cxx
-+++ sc/source/core/tool/progress.cxx
-@@ -162,7 +162,7 @@ void ScProgress::CreateInterpretProgress( ScDocument* pDoc, BOOL bWait )
-             if ( !pGlobalProgress )
-                 pInterpretProgress = new ScProgress( pDoc->GetDocumentShell(),
-                     ScGlobal::GetRscString( STR_PROGRESS_CALCULATING ),
--                    pDoc->GetFormulaCodeInTree(), FALSE, bWait );
-+                    pDoc->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE, FALSE, bWait );
-             pInterpretDoc = pDoc;
-         }
-     }