WaE: various compiler warnings

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