summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-01-07 15:09:48 +0200
committerJan Holesovsky <kendy@collabora.com>2015-01-07 14:15:11 +0100
commitb269af6c8995e4afff42d2118371ccfd3812963e (patch)
tree4eda2d55b21015eaeb5272cf6f5bf85a247dd2ec /sc/source
parenta2c062d2cf102cffdb22f456faed172e5112fb24 (diff)
Revert "Check number of cells referenced by group instead of group size"
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/core/data/formulacell.cxx9
-rw-r--r--sc/source/core/tool/token.cxx27
2 files changed, 1 insertions, 35 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index daefcc6ab2b7..bc9ffbe4940c 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 (GetWeight() < ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
+ if (GetSharedLength() < ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
{
mxGroup->meCalcState = sc::GroupCalcDisabled;
return false;
@@ -4128,13 +4128,6 @@ SCROW ScFormulaCell::GetSharedLength() const
return mxGroup ? mxGroup->mnLength : 0;
}
-sal_Int32 ScFormulaCell::GetWeight() const
-{
- if (!mxGroup)
- return pCode->GetWeight();
- return GetSharedLength() * GetSharedCode()->GetWeight();
-}
-
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 89a33e6f2fce..8816b87df833 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1412,33 +1412,6 @@ bool ScTokenArray::ImplGetReference( ScRange& rRange, const ScAddress& rPos, boo
return bIs;
}
-sal_Int32 ScTokenArray::GetWeight() const
-{
- sal_Int32 result(0);
-
- 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