fix wrong calculation of IFERROR and Match function when missing argu…

…ment
nissl-lab · Sep 1, 2020 · fa5aab3 · fa5aab3
1 parent d523ac9
commit fa5aab3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/main/SS/Formula/Atp/IfError.cs b/main/SS/Formula/Atp/IfError.cs
@@ -57,7 +57,15 @@ private static ValueEval EvaluateInternal(ValueEval arg, ValueEval iferror, int
             arg = WorkbookEvaluator.DereferenceResult(arg, srcCellRow, srcCellCol);
             if (arg is ErrorEval)
             {
-                return iferror;
+                //if the 2nd argument is missing, use an empty string as default
+                if (iferror is MissingArgEval)
+                {
+                    return new StringEval(string.Empty);
+                }
+                else
+                {
+                    return iferror;
+                }
             }
             else
             {

diff --git a/main/SS/Formula/Functions/Match.cs b/main/SS/Formula/Functions/Match.cs
@@ -202,6 +202,11 @@ private static double EvaluateMatchTypeArg(ValueEval arg, int srcCellRow, int sr
                 // if the string Parses as a number, it Is OK
                 return d;
             }
+            //if the 3rd argument is missing, use the default value
+            if (match_type is MissingArgEval)
+            {
+                return 1d;
+            }
             throw new Exception("Unexpected match_type type (" + match_type.GetType().Name + ")");
         }