diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-01-07 15:09:48 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-01-07 14:15:11 +0100 |
| commit | b269af6c8995e4afff42d2118371ccfd3812963e (patch) | |
| tree | 4eda2d55b21015eaeb5272cf6f5bf85a247dd2ec /sc/source/core/data | |
| parent | a2c062d2cf102cffdb22f456faed172e5112fb24 (diff) | |
Revert "Check number of cells referenced by group instead of group size"
This reverts commit cc4dbc0c4613b169045341d1f02bc4c47a407fa0.
Diffstat (limited to 'sc/source/core/data')
| -rw-r--r-- | sc/source/core/data/formulacell.cxx | 9 |
1 files changed, 1 insertions, 8 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; |