coverity#1359230 DEADCODE, detect missing parameter, tdf#97831 follow-up

... so SWITCH with less than 3 parameters returns the proper error code
instead of #N/A.

Change-Id: Ib5d696a640f7084ca46c3cf8f378ea6e659e3f11

1 files changed, 3 insertions, 7 deletions

diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index 1b7bf6d5380f..36304d8849aa 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -1913,6 +1913,9 @@ void ScInterpreter::ScSwitch_MS()
 {
     short nParamCount = GetByte();
 
+    if (!MustHaveParamCountMin( nParamCount, 3))
+        return;
+
     ReverseStack( nParamCount );
 
     nGlobalError = 0;   // propagate only for match or active result path
@@ -1970,13 +1973,6 @@ void ScInterpreter::ScSwitch_MS()
              ( !isValue && aRefStr.getDataIgnoreCase() == aStr.getDataIgnoreCase() )) )
         {
             // TRUE
-            if ( nParamCount < 1 )
-            {
-                // no parameter given for THEN
-                nGlobalError = nFirstMatchError;
-                PushParameterExpected();
-                return;
-            }
             bFinished = true;
         }
         else