summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-09-19 18:04:54 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-09-20 10:38:58 +0000
commit7d27c316dc7e3096f44c44465e87ff8136d70867 (patch)
tree6f2a527c42e64ab8ec2134483799d3abf8bab0a1
parent33cce7003da859fa88fd770f98fefeb8717996c2 (diff)
Resolves: tdf#102215 do not return coded double error for single matrix value
Change-Id: I94477bf64ee7972e9822921a8a15d935cb01e53b (cherry picked from commit 388014fc19b2a785f887cdfee91100fc9ab8d58d) Reviewed-on: https://gerrit.libreoffice.org/29035 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/core/tool/interpr4.cxx26
1 files changed, 24 insertions, 2 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index e4b3e5e68ffc..24a3d53dc093 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1964,14 +1964,36 @@ double ScInterpreter::GetDoubleFromMatrix(const ScMatrixRef& pMat)
return 0.0;
if ( !pJumpMatrix )
- return pMat->GetDoubleWithStringConversion( 0, 0);
+ {
+ double fVal = pMat->GetDoubleWithStringConversion( 0, 0);
+ sal_uInt16 nErr = GetDoubleErrorValue( fVal);
+ if (nErr)
+ {
+ // Do not propagate the coded double error, but set nGlobalError in
+ // case the matrix did not have an error interpreter set.
+ SetError( nErr);
+ fVal = 0.0;
+ }
+ return fVal;
+ }
SCSIZE nCols, nRows, nC, nR;
pMat->GetDimensions( nCols, nRows);
pJumpMatrix->GetPos( nC, nR);
// Use vector replication for single row/column arrays.
if ( (nC < nCols || nCols == 1) && (nR < nRows || nRows == 1) )
- return pMat->GetDoubleWithStringConversion( nC, nR);
+ {
+ double fVal = pMat->GetDoubleWithStringConversion( nC, nR);
+ sal_uInt16 nErr = GetDoubleErrorValue( fVal);
+ if (nErr)
+ {
+ // Do not propagate the coded double error, but set nGlobalError in
+ // case the matrix did not have an error interpreter set.
+ SetError( nErr);
+ fVal = 0.0;
+ }
+ return fVal;
+ }
SetError( errNoValue);
return 0.0;