mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not override nGlobalError with error from ConvertStringToValue()

Browse Source 
... so an already existing previous error is kept.

Change-Id: Ie731f17e93afa512542cc3ba2378031e978f9462
This commit is contained in:
Eike Rathke
2016-06-15 21:57:23 +02:00
parent b5876bfcb6
commit df14999784
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sc/source/core/tool/interpr4.cxx
View File

@@ -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;
}