more robust implicit intersection optimizing

For example, FormulaCompiler::MergeRangeReference() may replace
the parameter tokens and merge two into one.

Change-Id: Ie2933dec3ef73b5b605160e86a8ab3b5b1d17c1c
Reviewed-on: https://gerrit.libreoffice.org/58684
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 969bd41d838a..394f532b57fc 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -305,10 +305,11 @@ private:
     // be important. Store candidate parameters and the operation they are the argument for.
     struct PendingImplicitIntersectionOptimization
     {
-        PendingImplicitIntersectionOptimization(formula::FormulaToken** p, const formula::FormulaToken* o)
-            : parameter( p ), operation( o ) {}
-        formula::FormulaToken** parameter;
-        const formula::FormulaToken* operation;
+        PendingImplicitIntersectionOptimization(formula::FormulaToken** p, formula::FormulaToken* o)
+            : parameterLocation( p ), parameter( *p ), operation( o ) {}
+        formula::FormulaToken** parameterLocation;
+        formula::FormulaTokenRef parameter;
+        formula::FormulaTokenRef operation;
     };
     std::vector< PendingImplicitIntersectionOptimization > mPendingImplicitIntersectionOptimizations;
     std::set<formula::FormulaTokenRef> mUnhandledPossibleImplicitIntersections;