diff options
| author | Eike Rathke <erack@redhat.com> | 2016-03-17 23:18:06 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-03-18 10:37:40 +0100 |
| commit | 64e542413851236c75e25185c137d6fd6ddfe3a1 (patch) | |
| tree | 63917c801d463b4544aad77a70e688612169d136 /include | |
| parent | f4c59e5364e449bd8ce5420ff57331677ff859b9 (diff) | |
Resolves: tdf#96915 implement other-sheet-local named expressions
Change-Id: I0d62536caa6eb455473a755067abc585662cd9a5
Diffstat (limited to 'include')
| -rw-r--r-- | include/formula/token.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 618168ecb34b..e0cd6b77ab87 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -154,8 +154,8 @@ public: virtual void SetString( const svl::SharedString& rStr ); virtual sal_uInt16 GetIndex() const; virtual void SetIndex( sal_uInt16 n ); - virtual bool IsGlobal() const; - virtual void SetGlobal( bool b ); + virtual sal_Int16 GetSheet() const; + virtual void SetSheet( sal_Int16 n ); virtual short* GetJump() const; virtual const OUString& GetExternal() const; virtual FormulaToken* GetFAPOrigToken() const; @@ -310,18 +310,18 @@ class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken { private: sal_uInt16 nIndex; - bool mbGlobal; + sal_Int16 mnSheet; public: - FormulaIndexToken( OpCode e, sal_uInt16 n, bool bGlobal = true ) : - FormulaToken( svIndex, e ), nIndex( n ), mbGlobal( bGlobal ) {} + FormulaIndexToken( OpCode e, sal_uInt16 n, sal_Int16 nSheet = -1 ) : + FormulaToken( svIndex, e ), nIndex( n ), mnSheet( nSheet ) {} FormulaIndexToken( const FormulaIndexToken& r ) : - FormulaToken( r ), nIndex( r.nIndex ), mbGlobal( r.mbGlobal ) {} + FormulaToken( r ), nIndex( r.nIndex ), mnSheet( r.mnSheet ) {} virtual FormulaToken* Clone() const override { return new FormulaIndexToken(*this); } virtual sal_uInt16 GetIndex() const override; virtual void SetIndex( sal_uInt16 n ) override; - virtual bool IsGlobal() const override; - virtual void SetGlobal( bool b ) override; + virtual sal_Int16 GetSheet() const override; + virtual void SetSheet( sal_Int16 n ) override; virtual bool operator==( const FormulaToken& rToken ) const override; }; |