diff options
author | Eike Rathke <erack@redhat.com> | 2015-06-23 13:02:01 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2015-06-23 13:31:55 +0200 |
commit | df36fb6208123b0d61911c4714d1ab39c4e8285a (patch) | |
tree | 276441fb58691f0c0ed5b0a25eab30d5a67ea969 /include | |
parent | fc61dbd5fa32307081a26a1223ca3db65892bf44 (diff) |
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
(cherry picked from commit 80aafaf79306ea82cd24f10f200908addccaf34f)
Diffstat (limited to 'include')
-rw-r--r-- | include/formula/tokenarray.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index 1050047af137..58bb092f3a7a 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -115,6 +115,7 @@ protected: sal_uInt16 nError; // Error code ScRecalcMode nMode; // Flags to indicate when to recalc this code bool bHyperLink; // If HYPERLINK() occurs in the formula. + bool mbFromRangeName; // If this array originates from a named expression protected: void Assign( const FormulaTokenArray& ); @@ -164,6 +165,9 @@ public: virtual ~FormulaTokenArray(); FormulaTokenArray* Clone() const; /// True copy! + void SetFromRangeName( bool b ) { mbFromRangeName = b; } + bool IsFromRangeName() const { return mbFromRangeName; } + void Clear(); void DelRPN(); FormulaToken* First() { nIndex = 0; return Next(); } |