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

[Kohei Yoshida]

 patches/dev300/apply                                |    3 
 patches/dev300/calc-formula-matrix-no-autocalc.diff |  120 --------------------
 2 files changed, 123 deletions(-)

New commits:
commit 493b678e09fa83932bc3d97b1b967f2b827458d2
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Oct 4 14:50:37 2010 -0400

    Removed calc-formula-matrix-no-autocalc.diff; moved to git.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b4cd1d1..2127d28 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2694,9 +2694,6 @@ calc-insert-current-time-vcl.diff,       kohei
 calc-pdf-export-allow-filtered-range-sc.diff,     n#585028, kohei
 calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei
 
-# Allow array result to be computed even when the auto calculate is off.
-calc-formula-matrix-no-autocalc.diff, n#503918, kohei
-
 # Fix auto-sum and reference selection for function wizard in R1C1 mode.
 calc-formula-r1c1-ui-fix.diff, n#595078, n#595080, kohei
 
diff --git a/patches/dev300/calc-formula-matrix-no-autocalc.diff b/patches/dev300/calc-formula-matrix-no-autocalc.diff
deleted file mode 100644
index 5138e43..0000000
--- a/patches/dev300/calc-formula-matrix-no-autocalc.diff
+++ /dev/null
@@ -1,120 +0,0 @@
----
- sc/inc/cell.hxx               |    2 ++
- sc/source/core/data/cell.cxx  |   12 ++++++++++--
- sc/source/core/data/cell2.cxx |   23 ++++++++---------------
- 3 files changed, 20 insertions(+), 17 deletions(-)
-
-diff --git sc/inc/cell.hxx sc/inc/cell.hxx
-index 93818ec..847e833 100644
---- sc/inc/cell.hxx
-+++ sc/inc/cell.hxx
-@@ -538,6 +538,8 @@ public:
- 
-     /** Determines whether or not the result string contains more than one paragraph */
-     bool            IsMultilineResult();
-+
-+    void            MaybeInterpret();
- };
- 
- //			Iterator fuer Referenzen in einer Formelzelle
-diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx
-index d73bc1f..7e37c8e 100644
---- sc/source/core/data/cell.cxx
-+++ sc/source/core/data/cell.cxx
-@@ -899,8 +899,7 @@ void ScFormulaCell::GetFormula( String& rFormula, const FormulaGrammar::Grammar
- 
- void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows )
- {
--    if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
--        Interpret();
-+    MaybeInterpret();
- 
-     const ScMatrix* pMat = NULL;
-     if (!pCode->GetCodeError() && aResult.GetType() == svMatrixCell &&
-@@ -1969,6 +1968,15 @@ bool ScFormulaCell::IsMultilineResult()
-     return false;
- }
- 
-+void ScFormulaCell::MaybeInterpret()
-+{
-+    if (!IsDirtyOrInTableOpDirty())
-+        return;
-+
-+    if (pDocument->GetAutoCalc() || (cMatrixFlag != MM_NONE))
-+        Interpret();
-+}
-+
- EditTextObject* ScFormulaCell::CreateURLObject()
- {
-     String aCellText;
-diff --git sc/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
-index f2a1429..d3b3621 100644
---- sc/source/core/data/cell2.cxx
-+++ sc/source/core/data/cell2.cxx
-@@ -489,29 +489,25 @@ bool lcl_isReference(const FormulaToken& rToken)
- 
- BOOL ScFormulaCell::IsEmpty()
- {
--    if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
--        Interpret();
-+    MaybeInterpret();
-     return aResult.GetCellResultType() == formula::svEmptyCell;
- }
- 
- BOOL ScFormulaCell::IsEmptyDisplayedAsString()
- {
--    if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
--        Interpret();
-+    MaybeInterpret();
-     return aResult.IsEmptyDisplayedAsString();
- }
- 
- BOOL ScFormulaCell::IsValue()
- {
--    if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
--        Interpret();
-+    MaybeInterpret();
-     return aResult.IsValue();
- }
- 
- double ScFormulaCell::GetValue()
- {
--    if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
--        Interpret();
-+    MaybeInterpret();
-     if ((!pCode->GetCodeError() || pCode->GetCodeError() == errDoubleRef) &&
-             !aResult.GetResultError())
-         return aResult.GetDouble();
-@@ -521,16 +517,13 @@ double ScFormulaCell::GetValue()
- double ScFormulaCell::GetValueAlways()
- {
-     // for goal seek: return result value even if error code is set
--
--    if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
--        Interpret();
-+    MaybeInterpret();
-     return aResult.GetDouble();
- }
- 
- void ScFormulaCell::GetString( String& rString )
- {
--    if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
--        Interpret();
-+    MaybeInterpret();
-     if ((!pCode->GetCodeError() || pCode->GetCodeError() == errDoubleRef) &&
-             !aResult.GetResultError())
-         rString = aResult.GetString();
-@@ -722,8 +715,8 @@ USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
- 
- USHORT ScFormulaCell::GetErrCode()
- {
--    if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
--        Interpret();
-+    MaybeInterpret();
-+
-     /* FIXME: If ScTokenArray::SetCodeError() was really only for code errors
-      * and not also abused for signaling other error conditions we could bail
-      * out even before attempting to interpret broken code. */
--- 
-1.7.0.1
-