[Libreoffice-commits] core.git: Branch 'feature/calc-parallel' - formula/source
Eike Rathke
erack at redhat.com
Wed Nov 15 17:05:39 UTC 2017
formula/source/core/api/token.cxx | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
New commits:
commit bc41b7030082e6699a4cfcad56d76ef0fb3d60a2
Author: Eike Rathke <erack at redhat.com>
Date: Wed Nov 15 17:41:05 2017 +0100
Assert all FormulaToken::Set...() virtual dummy methods
Attempting to set on a wrong token type can never be right.
Change-Id: I788221505a628f40dfbb9c2ee7c92ac789529303
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index bba921d98539..2ed68521e720 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -181,7 +181,7 @@ sal_uInt8 FormulaToken::GetByte() const
void FormulaToken::SetByte( sal_uInt8 )
{
- SAL_WARN( "formula.core", "FormulaToken::SetByte: virtual dummy called" );
+ assert( !"virtual dummy called" );
}
ParamClass FormulaToken::GetInForceArray() const
@@ -192,19 +192,20 @@ ParamClass FormulaToken::GetInForceArray() const
void FormulaToken::SetInForceArray( ParamClass )
{
- SAL_WARN( "formula.core", "FormulaToken::SetInForceArray: virtual dummy called" );
+ assert( !"virtual dummy called" );
}
double FormulaToken::GetDouble() const
{
- // This one is worth an assert.
- assert( !"FormulaToken::GetDouble: virtual dummy called" );
+ // This Get is worth an assert.
+ assert( !"virtual dummy called" );
return 0.0;
}
double & FormulaToken::GetDoubleAsReference()
{
- SAL_WARN( "formula.core", "FormulaToken::GetDouble: virtual dummy called" );
+ // This Get is worth an assert.
+ assert( !"virtual dummy called" );
static double fVal = 0.0;
return fVal;
}
@@ -228,7 +229,7 @@ svl::SharedString FormulaToken::GetString() const
void FormulaToken::SetString( const svl::SharedString& )
{
- SAL_WARN( "formula.core", "FormulaToken::SetString: virtual dummy called" );
+ assert( !"virtual dummy called" );
}
sal_uInt16 FormulaToken::GetIndex() const
@@ -239,7 +240,7 @@ sal_uInt16 FormulaToken::GetIndex() const
void FormulaToken::SetIndex( sal_uInt16 )
{
- SAL_WARN( "formula.core", "FormulaToken::SetIndex: virtual dummy called" );
+ assert( !"virtual dummy called" );
}
sal_Int16 FormulaToken::GetSheet() const
@@ -250,7 +251,7 @@ sal_Int16 FormulaToken::GetSheet() const
void FormulaToken::SetSheet( sal_Int16 )
{
- SAL_WARN( "formula.core", "FormulaToken::SetSheet: virtual dummy called" );
+ assert( !"virtual dummy called" );
}
short* FormulaToken::GetJump() const
@@ -281,7 +282,7 @@ FormulaError FormulaToken::GetError() const
void FormulaToken::SetError( FormulaError )
{
- SAL_WARN( "formula.core", "FormulaToken::SetError: virtual dummy called" );
+ assert( !"virtual dummy called" );
}
const ScSingleRefData* FormulaToken::GetSingleRef() const
More information about the Libreoffice-commits
mailing list