diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-12-03 21:46:37 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-12-19 22:08:26 +0100 |
| commit | 00bc5a097313fbd003675267be961ad3a152ba42 (patch) | |
| tree | de9b9e6981d3c2f262b9391335a067d4898185b6 /formula/source/core/api/token.cxx | |
| parent | b74da08e556b7b001943f0288a61da53791d4dcf (diff) | |
wrap scoped enum around css::util::NumberFormat
Change-Id: Icab5ded8bccdb95f79b3fa35ea164f47919c68fa
Reviewed-on: https://gerrit.libreoffice.org/46339
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'formula/source/core/api/token.cxx')
| -rw-r--r-- | formula/source/core/api/token.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 07ff7cc59b6e..cfd759562d59 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -210,13 +210,13 @@ double & FormulaToken::GetDoubleAsReference() return fVal; } -short FormulaToken::GetDoubleType() const +sal_Int16 FormulaToken::GetDoubleType() const { SAL_WARN( "formula.core", "FormulaToken::GetDoubleType: virtual dummy called" ); return 0; } -void FormulaToken::SetDoubleType( short ) +void FormulaToken::SetDoubleType( sal_Int16 ) { assert( !"virtual dummy called" ); } @@ -1785,7 +1785,7 @@ void FormulaTokenArrayPlainIterator::AfterRemoveToken( sal_uInt16 nOffset, sal_u double FormulaDoubleToken::GetDouble() const { return fDouble; } double & FormulaDoubleToken::GetDoubleAsReference() { return fDouble; } -short FormulaDoubleToken::GetDoubleType() const +sal_Int16 FormulaDoubleToken::GetDoubleType() const { // This is a plain double value without type information, don't emit a // warning via FormulaToken::GetDoubleType(). @@ -1797,12 +1797,12 @@ bool FormulaDoubleToken::operator==( const FormulaToken& r ) const return FormulaToken::operator==( r ) && fDouble == r.GetDouble(); } -short FormulaTypedDoubleToken::GetDoubleType() const +sal_Int16 FormulaTypedDoubleToken::GetDoubleType() const { return mnType; } -void FormulaTypedDoubleToken::SetDoubleType( short nType ) +void FormulaTypedDoubleToken::SetDoubleType( sal_Int16 nType ) { mnType = nType; } |