added mnStringNoValueError handling to ConvertStringToValue() (fdo#51442 dependency)

Change-Id: I05c2ddc0ebde6675e9f98722c4feb1ed49670dee
(cherry picked from commit 5f86b4be3c40180031aa723f5fa44a19595bffa8)

1 files changed, 7 insertions, 1 deletions

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 4a1020120d70..0fbae525957f 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -239,10 +239,16 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
     // We keep this code until we provide a friendly way to convert string
     // numbers into numbers in the UI.
     double fValue = 0.0;
+    if (mnStringNoValueError == errCellNoValue)
+    {
+        // Requested that all strings result in 0, error handled by caller.
+        SetError( mnStringNoValueError);
+        return fValue;
+    }
     sal_uInt32 nFIndex = 0;
     if (!pFormatter->IsNumberFormat(rStr, nFIndex, fValue))
     {
-        SetError(errNoValue);
+        SetError( mnStringNoValueError);
         fValue = 0.0;
     }
     return fValue;