summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-01-27 14:50:36 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-02-03 11:15:22 +0000
commite4de059c53dc2cc6547e7af55789aee4ec214c60 (patch)
tree6d0b736e10dfffc72eadd35391465c51aa764772
parent2be46f01479b815711b64473d327fbf207f494bf (diff)
Resolves: tdf#88786 correct matrix sub operation
Change-Id: Ib5ce2ffe17cc34e0b3f04ebc06ea392707b7b9e6 (cherry picked from commit b435ca9e6f826704314f8a437c352aa799767bd4) Reviewed-on: https://gerrit.libreoffice.org/14208 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--sc/source/core/tool/interpr5.cxx2
-rw-r--r--sc/source/core/tool/scmatrix.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 0d5f907cddb8..aa425b39aa47 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1286,7 +1286,7 @@ void ScInterpreter::CalculateAddSub(bool _bSub)
}
else
{
- pMat->SubAddOp(true, fVal, aString, *pResMat);
+ pMat->SubAddOp(false, -fVal, aString, *pResMat);
}
PushMatrix(pResMat);
}
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index bf2f1632b6d2..4402002593f6 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -2553,12 +2553,12 @@ public:
double operator()(double nVal) const
{
- return nVal - mnVal;
+ return mnVal - nVal;
}
double operator()(bool bVal) const
{
- return (double)bVal - mnVal;
+ return mnVal - (double)bVal;
}
svl::SharedString operator()(const svl::SharedString&) const