[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source

[Eike Rathke]

 sc/source/core/tool/scmatrix.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7206e030e143706db9d7029a6dfa20f89f14b1c2
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Jun 15 20:49:31 2016 +0200

    set string conversion error also at interpreter if available
    
    Change-Id: Idedb9192938a01ecfda3dd93e69c16a896801fd7
    (cherry picked from commit 68455c20cb5edf2bfc57243b44fc81b7fa5ea5db)
    Reviewed-on: https://gerrit.libreoffice.org/26335
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 4a3aaf2..9dfc2e5 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -77,7 +77,10 @@ double convertStringToValue( ScInterpreter* pErrorInterpreter, const OUString& r
         short nCurFmtType = 0;
         double fValue = pErrorInterpreter->ConvertStringToValue( rStr, nError, nCurFmtType);
         if (nError)
+        {
+            pErrorInterpreter->SetError( nError);
             return formula::CreateDoubleError( nError);
+        }
         return fValue;
     }
     return formula::CreateDoubleError( formula::errNoValue);