diff options
| author | Dennis Francis <dennis.francis@collabora.com> | 2021-01-06 17:44:00 +0530 |
|---|---|---|
| committer | Dennis Francis <dennis.francis@collabora.com> | 2021-01-14 10:47:19 +0100 |
| commit | b14107dd0eaf9bfc276544e1900873d36075425e (patch) | |
| tree | 64bef36e5ac9f37762651007559b1c80d37e6b3c /sc/inc | |
| parent | 2e942c9b2705ae29573d9874e139888a1b76643c (diff) | |
tdf#133858 reduce the double-ref range to data content
in certain matrix formulas like SUM(IF(A1=G:G, H:H)*B1/B2) where whole
columns are used for comparison in the condition of IF ultimately
followed by a reducer like SUM. In such cases we can safely reduce the
double-refs involved in the comparison to the sheet area where there is
data before converting the data to ScMatrix.
This is a more restricted version of Noel's fix in
37ffe509ef011357123642577c04ff296d59ce68
Change-Id: I1c2e8985adedb3f4c4648f541fb0e8e7d0fae033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109050
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
(cherry picked from commit 65167a9265acfea04733b5ff6ee3220a9da624f4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109118
Tested-by: Jenkins
Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/compiler.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/refdata.hxx | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 5299cf5774fe..b051f3ad4b4e 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -514,10 +514,12 @@ private: bool HandleIIOpCodeInternal(formula::FormulaToken* token, formula::FormulaToken*** pppToken, sal_uInt8 nNumParams); bool SkipImplicitIntersectionOptimization(const formula::FormulaToken* token) const; virtual void PostProcessCode() override; + virtual void AnnotateOperands() override; static bool ParameterMayBeImplicitIntersection(const formula::FormulaToken* token, int parameter); void ReplaceDoubleRefII(formula::FormulaToken** ppDoubleRefTok); bool AdjustSumRangeShape(const ScComplexRefData& rBaseRange, ScComplexRefData& rSumRange); void CorrectSumRange(const ScComplexRefData& rBaseRange, ScComplexRefData& rSumRange, formula::FormulaToken** ppSumRangeToken); + void AnnotateTrimOnDoubleRefs(); }; #endif diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx index a2c9313b607e..9b57fe807536 100644 --- a/sc/inc/refdata.hxx +++ b/sc/inc/refdata.hxx @@ -124,6 +124,11 @@ struct ScComplexRefData { ScSingleRefData Ref1; ScSingleRefData Ref2; + bool bTrimToData; + + ScComplexRefData() : + bTrimToData(false) + {} void InitFlags() { Ref1.InitFlags(); Ref2.InitFlags(); } @@ -198,6 +203,9 @@ struct ScComplexRefData bool IsDeleted() const; + bool IsTrimToData() const { return bTrimToData; } + void SetTrimToData(bool bSet) { bTrimToData = bSet; } + #if DEBUG_FORMULA_COMPILER void Dump( int nIndent = 0 ) const; #endif |