diff options
| author | Eike Rathke <erack@redhat.com> | 2015-01-27 14:50:36 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-01-27 15:16:36 +0100 |
| commit | b435ca9e6f826704314f8a437c352aa799767bd4 (patch) | |
| tree | e4bf8c9d09d0b04427946f59f08bd14ab36e740b /sc | |
| parent | c072bd1df9bd01b34b99fbff50ee09bd5f5ac6ee (diff) | |
Resolves: tdf#88786 correct matrix sub operation
Change-Id: Ib5ce2ffe17cc34e0b3f04ebc06ea392707b7b9e6
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr5.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/scmatrix.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index fe87c0457eed..b6d616e11619 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -1297,7 +1297,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 |