[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/inc sc/source

[Tor Lillqvist]

 sc/inc/formulacell.hxx              |    4 ++++
 sc/inc/tokenarray.hxx               |    3 +++
 sc/source/core/data/formulacell.cxx |   13 ++++++++++++-
 sc/source/core/tool/token.cxx       |   27 +++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)

New commits:
commit 3c50f98dc266b42ffe9cdc8843d21e4a47a16bcb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Feb 4 16:19:38 2015 +0200

    Check number of cells referenced by group instead of group size
    
    Put using it in #if 0 for now, though.
    
    This reverts commit 1fd902d4b851c534cf7473dd13983fc2c46500ed
    
    Change-Id: I7bb3efdc594bf7f1a61b037bf3488dae4ca119c9
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 86b8045..746ca550 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -410,6 +410,10 @@ public:
     bool IsSharedTop() const;
     SCROW GetSharedTopRow() const;
     SCROW GetSharedLength() const;
+
+    // An estimate of the number of cells referenced by the formula
+    sal_Int32 GetWeight() const;
+
     ScTokenArray* GetSharedCode();
     const ScTokenArray* GetSharedCode() const;
 
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 07f344b..ad61ef3 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -59,6 +59,9 @@ public:
     virtual ~ScTokenArray();
     ScTokenArray* Clone() const;    /// True copy!
 
+    // An estimate of the number of cells referenced by the token array
+    sal_Int32 GetWeight() const;
+
     void GenHash();
     size_t GetHash() const { return mnHashValue;}
 
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index bc9ffbe..98bb568 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3750,7 +3750,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
     if (mxGroup->meCalcState == sc::GroupCalcDisabled)
         return false;
 
-    if (GetSharedLength() < ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
+    if (GetWeight() < ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
     {
         mxGroup->meCalcState = sc::GroupCalcDisabled;
         return false;
@@ -4128,6 +4128,17 @@ SCROW ScFormulaCell::GetSharedLength() const
     return mxGroup ? mxGroup->mnLength : 0;
 }
 
+sal_Int32 ScFormulaCell::GetWeight() const
+{
+#if 0
+    if (!mxGroup)
+        return pCode->GetWeight();
+    return GetSharedLength() * GetSharedCode()->GetWeight();
+#else
+    return GetSharedLength();
+#endif
+}
+
 ScTokenArray* ScFormulaCell::GetSharedCode()
 {
     return mxGroup ? mxGroup->mpCode : NULL;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8816b87..ee55b07 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1412,6 +1412,33 @@ bool ScTokenArray::ImplGetReference( ScRange& rRange, const ScAddress& rPos, boo
     return bIs;
 }
 
+sal_Int32 ScTokenArray::GetWeight() const
+{
+    sal_Int32 result(1);
+
+    FormulaToken** p = pCode;
+    FormulaToken** pEnd = p + static_cast<size_t>(nLen);
+    for (; p != pEnd; ++p)
+    {
+        switch ((*p)->GetType())
+        {
+        case svDoubleRef :
+        case svExternalDoubleRef:
+            {
+                const ScComplexRefData& rRef = *(*p)->GetDoubleRef();
+                result += ( (rRef.Ref2.Row() - rRef.Ref1.Row() + 1) * (rRef.Ref2.Col() - rRef.Ref1.Col() + 1) );
+            }
+            break;
+        default:
+            break;
+        }
+    }
+    // Just print out the this pointer. It turns out to be quite complicated to get
+    // a symbolic printout of the ScTokenArray here.
+    SAL_INFO("sc.token", "GetWeight(" << this << "): " << result);
+    return result;
+}
+
 namespace {
 
 // we want to compare for similar not identical formulae