summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-06-15 21:57:23 +0200
committerEike Rathke <erack@redhat.com>2016-06-15 22:04:03 +0200
commitdf149997849c1e07d735fdeefccf875e7361aa4c (patch)
tree15887db982c9c604ce3079ab44766c380c5a480c
parentb5876bfcb69a65c87d602bae687b3c0634c0a1e7 (diff)
do not override nGlobalError with error from ConvertStringToValue()
... so an already existing previous error is kept. Change-Id: Ie731f17e93afa512542cc3ba2378031e978f9462
-rw-r--r--sc/source/core/tool/interpr4.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c773f7bd73a7..f7c75a651335 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;
}