in OOXML save references of named expressions with col,row=0,0 base position

Saving relative references of named expressions to OOXML never worked,
upon reload they pointed to a different position offset by the value of
the original base position. This at least saves positive relative
references correctly, while generating #REF! for negative offsets which
is slightly better than having them point to a wrong location and
silently calculate different values..

Also, this is a prerequisite for TableRef ThisRow references in named
expressions to be saved correctly in A1 notation, which results in a
relative row 0 value.

Change-Id: I3734f910794ceab4b9224b214ad11c64d1d18e67

2 files changed, 1 insertions, 5 deletions

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 8c6b3732e48d..2dfa2f7247b1 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -218,7 +218,7 @@ public:
             formula::FormulaGrammar::Grammar eGram,
             const ScAddress& rPos,
             const OUString& rErrRef, const std::vector<OUString>& rTabNames,
-            const ScComplexRefData& rRef, bool bSingleRef ) const = 0;
+            const ScComplexRefData& rRef, bool bSingleRef, bool bFromRangeName ) const = 0;
 
         virtual ::com::sun::star::i18n::ParseResult
                     parseAnyToken( const OUString& rFormula,
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index b36936a332e7..0d3fa0245f50 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -52,7 +52,6 @@ class SC_DLLPUBLIC ScTokenArray : public formula::FormulaTokenArray
 
     size_t mnHashValue;
     ScFormulaVectorState meVectorState;
-    bool mbFromRangeName;
 
 public:
     ScTokenArray();
@@ -70,9 +69,6 @@ public:
 
     ScFormulaVectorState GetVectorState() const { return meVectorState;}
 
-    void SetFromRangeName( bool b ) { mbFromRangeName = b; }
-    bool IsFromRangeName() const { return mbFromRangeName; }
-
     /**
      * If the array contains at least one relative row reference or named
      * expression, it's variant. Otherwise invariant.