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 /formula | |
| parent | f4c59e5364e449bd8ce5420ff57331677ff859b9 (diff) | |
Resolves: tdf#96915 implement other-sheet-local named expressions
Change-Id: I0d62536caa6eb455473a755067abc585662cd9a5
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/token.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 22d3c84bb9db..7009d94e4756 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -221,15 +221,15 @@ void FormulaToken::SetIndex( sal_uInt16 ) SAL_WARN( "formula.core", "FormulaToken::SetIndex: virtual dummy called" ); } -bool FormulaToken::IsGlobal() const +sal_Int16 FormulaToken::GetSheet() const { - SAL_WARN( "formula.core", "FormulaToken::IsGlobal: virtual dummy called" ); - return true; + SAL_WARN( "formula.core", "FormulaToken::GetSheet: virtual dummy called" ); + return -1; } -void FormulaToken::SetGlobal( bool ) +void FormulaToken::SetSheet( sal_Int16 ) { - SAL_WARN( "formula.core", "FormulaToken::SetGlobal: virtual dummy called" ); + SAL_WARN( "formula.core", "FormulaToken::SetSheet: virtual dummy called" ); } short* FormulaToken::GetJump() const @@ -1724,12 +1724,12 @@ bool FormulaStringOpToken::operator==( const FormulaToken& r ) const sal_uInt16 FormulaIndexToken::GetIndex() const { return nIndex; } void FormulaIndexToken::SetIndex( sal_uInt16 n ) { nIndex = n; } -bool FormulaIndexToken::IsGlobal() const { return mbGlobal; } -void FormulaIndexToken::SetGlobal( bool b ) { mbGlobal = b; } +sal_Int16 FormulaIndexToken::GetSheet() const { return mnSheet; } +void FormulaIndexToken::SetSheet( sal_Int16 n ) { mnSheet = n; } bool FormulaIndexToken::operator==( const FormulaToken& r ) const { return FormulaToken::operator==( r ) && nIndex == r.GetIndex() && - mbGlobal == r.IsGlobal(); + mnSheet == r.GetSheet(); } const OUString& FormulaExternalToken::GetExternal() const { return aExternal; } sal_uInt8 FormulaExternalToken::GetByte() const { return nByte; } |