diff options
| author | Eike Rathke <erack@redhat.com> | 2020-10-14 01:50:03 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2020-10-14 03:52:15 +0200 |
| commit | 5d9e33068e756b4e74aa2a5e8d9ed16dabe27f29 (patch) | |
| tree | c864a47a75638fd4707dad784c7d5c95955c9143 /formula | |
| parent | fead31c2c08c08023a237595f69b5da502ad5d18 (diff) | |
Derive FormulaExternalToken from FormulaByteToken, tdf#133260 follow-up
This should always have had a ParamClass member variable and
SetInForceArray()/GetInForceArray() functions but never did.
Now with
commit 3a33828b8de7554e497051738c722b1764960a86
CommitDate: Tue Oct 13 21:36:31 2020 +0200
Resolves: tdf#133260 Propagate ForceArrayReturn from inline arrays
it broke CppunitTest_sc_subsequent_filters_test with the virtual
dummy assert() in FormulaToken::SetInForceArray(). Unfortunately
not caught earlier but at least it did now.
Remove the duplicated FormulaToken overrides and simply derive
from FormulaByteToken instead that has all we need.
Change-Id: I7946602955970fb9d6f349efdacb41389e211b68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104262
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/token.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 68df38517f76..92f60254ec8f 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1929,12 +1929,9 @@ bool FormulaIndexToken::operator==( const FormulaToken& r ) const mnSheet == r.GetSheet(); } const OUString& FormulaExternalToken::GetExternal() const { return aExternal; } -sal_uInt8 FormulaExternalToken::GetByte() const { return nByte; } -void FormulaExternalToken::SetByte( sal_uInt8 n ) { nByte = n; } bool FormulaExternalToken::operator==( const FormulaToken& r ) const { - return FormulaToken::operator==( r ) && nByte == r.GetByte() && - aExternal == r.GetExternal(); + return FormulaByteToken::operator==( r ) && aExternal == r.GetExternal(); } |