[Libreoffice-commits] .: sc/qa sc/source

Eike Rathke erack at redhat.com
Sat Feb 2 09:16:57 PST 2013


 sc/qa/unit/ucalc.cxx             |    2 +-
 sc/source/core/tool/interpr1.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9d1324d750a07a0209460363b70742db374748ad
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Feb 2 18:15:55 2013 +0100

    fdo#57180 return #VALUE! error if a number couls not be parsed
    
    Change-Id: I25ed88b30329b92f80efd329243f85b271d972a7

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 09ada38..f29bac1 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -779,7 +779,7 @@ void testFuncNUMBERVALUE( ScDocument* pDoc )
     } aChecks[] = {
         { "=NUMBERVALUE(A1;\"b\";\"ag\")",  "199.9" },
         { "=NUMBERVALUE(A2;\"b\";\"ag\")",  "134.56789" },
-        { "=NUMBERVALUE(A2;\"b\";\"g\")",   "Err:502" },
+        { "=NUMBERVALUE(A2;\"b\";\"g\")",   "#VALUE!" },
         { "=NUMBERVALUE(A3;\"d\")",         "12.3456" },
         { "=NUMBERVALUE(A4;\"d\";\"foo\")", "0.4" },
         { "=NUMBERVALUE(A4;)",              "Err:502" },
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 53cb552..2ab779a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3472,7 +3472,7 @@ void ScInterpreter::ScNumberValue()
         PushDouble(fVal);
         return;
     }
-    PushIllegalArgument();
+    PushNoValue();
 }
 
 


More information about the Libreoffice-commits mailing list