summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-04-12 20:21:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-04-12 21:23:29 +0100
commit3c64f132e5fa17593ef07e5bb9d8ad1eeafcbfc8 (patch)
treeefffafbd583c7f36404287c4f88b6bab3c2d2819
parentbdc3d14e53f86439f131d00d0b3e4134d9ca6679 (diff)
WaE: various compiler warnings
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx9
-rw-r--r--formula/source/core/api/token.cxx9
2 files changed, 14 insertions, 4 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 8d0236d900..7b64c390ad 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -722,6 +722,7 @@ OpCode FormulaCompiler::GetEnglishOpCode( const String& rName ) const
bool FormulaCompiler::IsOpCodeVolatile( OpCode eOp )
{
+ bool bRet = false;
switch (eOp)
{
// no parameters:
@@ -739,9 +740,13 @@ bool FormulaCompiler::IsOpCodeVolatile( OpCode eOp )
case ocIndirectXL:
// ocOffset results in indirect references.
case ocOffset:
- return true;
+ bRet = true;
+ break;
+ default:
+ bRet = false;
+ break;
}
- return false;
+ return bRet;
}
// Remove quotes, escaped quotes are unescaped.
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 182459d24e..bff7d144dd 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -135,14 +135,19 @@ bool FormulaToken::IsMatrixFunction() const
bool FormulaToken::IsExternalRef() const
{
+ bool bRet = false;
switch (eType)
{
case svExternalSingleRef:
case svExternalDoubleRef:
case svExternalName:
- return true;
+ bRet = true;
+ break;
+ default:
+ bRet = false;
+ break;
}
- return false;
+ return bRet;
}
bool FormulaToken::operator==( const FormulaToken& rToken ) const