diff options
| author | Eike Rathke <erack@redhat.com> | 2016-05-20 16:35:08 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-05-20 20:29:04 +0000 |
| commit | df48c5aeadf89f89222a8188ce6a6d8bf96bda79 (patch) | |
| tree | 1aa5497fdf30ec9f39566aa054c11d233847a8b3 /sc | |
| parent | 247e418485c276bb9e8dcb84a6e11b90191482a3 (diff) | |
always use GetNewMat() in interpreter context instead of plain ScFullMatrix()
... so error handling interpreter is set and im-/mutable flagged
correctly.
Change-Id: I3e2647b6e4a4f4bcfdf7264d6942844941ea6c6b
(cherry picked from commit 981ff6dfd8627981462ec7c10a8a74d636d3d0d5)
Reviewed-on: https://gerrit.libreoffice.org/25213
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index bf3c0e2d5e43..6e9597d48a66 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -4651,7 +4651,7 @@ double ScInterpreter::IterateParametersIf( ScIterFuncIf eFunc ) break; case svExternalSingleRef: { - pSumExtraMatrix = new ScFullMatrix(1, 1, 0.0); + pSumExtraMatrix = GetNewMat(1,1); ScExternalRefCache::TokenRef pToken; PopExternalSingleRef(pToken); if (!pToken) @@ -5903,7 +5903,7 @@ void ScInterpreter::ScLookup() ScMatrixRef pDataMat2; if (bVertical) { - ScMatrixRef pTempMat(new ScFullMatrix(1, nR, 0.0)); + ScMatrixRef pTempMat = GetNewMat(1, nR); for (SCSIZE i = 0; i < nR; ++i) if (pDataMat->IsValue(0, i)) pTempMat->PutDouble(pDataMat->GetDouble(0, i), 0, i); @@ -5913,7 +5913,7 @@ void ScInterpreter::ScLookup() } else { - ScMatrixRef pTempMat(new ScFullMatrix(nC, 1, 0.0)); + ScMatrixRef pTempMat = GetNewMat(nC, 1); for (SCSIZE i = 0; i < nC; ++i) if (pDataMat->IsValue(i, 0)) pTempMat->PutDouble(pDataMat->GetDouble(i, 0), i, 0); |