diff options
author | Eike Rathke <erack@redhat.com> | 2016-06-15 16:45:32 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2016-06-15 19:28:53 +0000 |
commit | 5795989729274cdf8a8e6e1a55fb7cf12ab7fe7d (patch) | |
tree | 6f65f2d1c06455f346b621633e32b622dade626e | |
parent | 56c916992276baf374664d0bfca4181919b849f5 (diff) |
Resolves: tdf#100409 GetDoubleWithStringConversion() in GetDoubleFromMatrix()
Change-Id: I1e88e9fa6361c6f1f2aebebc101d44bc8e974283
(cherry picked from commit f219bd4c3599e0933760f8a9f0155fc97a9ab23c)
Reviewed-on: https://gerrit.libreoffice.org/26334
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r-- | sc/source/core/tool/interpr4.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 7284e306112c..6324103af569 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -1963,14 +1963,14 @@ double ScInterpreter::GetDoubleFromMatrix(const ScMatrixRef& pMat) return 0.0; if ( !pJumpMatrix ) - return pMat->GetDouble( 0 ); + return pMat->GetDoubleWithStringConversion( 0, 0); 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->GetDouble( nC, nR); + return pMat->GetDoubleWithStringConversion( nC, nR); SetError( errNoValue); return 0.0; |