diff options
| author | Eike Rathke <erack@redhat.com> | 2016-06-15 21:57:23 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-06-15 20:21:27 +0000 |
| commit | ef952e6c9756c3b2bde7d82202fb32a905a14daa (patch) | |
| tree | 1abb4cc75857de4df3117fe93ee8b780cac147f9 | |
| parent | 35205c6e3e2f85d9b7db935689ec949c98e7e431 (diff) | |
do not override nGlobalError with error from ConvertStringToValue()
... so an already existing previous error is kept.
Change-Id: Ie731f17e93afa512542cc3ba2378031e978f9462
(cherry picked from commit df149997849c1e07d735fdeefccf875e7361aa4c)
Reviewed-on: https://gerrit.libreoffice.org/26338
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 6324103af569..812409e39777 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -187,10 +187,11 @@ sal_uInt16 ScInterpreter::GetCellErrCode( const ScRefCellValue& rCell ) double ScInterpreter::ConvertStringToValue( const OUString& rStr ) { - double fValue = ScGlobal::ConvertStringToValue( rStr, maCalcConfig, nGlobalError, mnStringNoValueError, + sal_uInt16 nError = 0; + double fValue = ScGlobal::ConvertStringToValue( rStr, maCalcConfig, nError, mnStringNoValueError, pFormatter, nCurFmtType); - if (nGlobalError) - SetError(nGlobalError); + if (nError) + SetError(nError); return fValue; } |