[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

[Eike Rathke]

 sc/source/core/tool/interpr5.cxx |    2 +-
 sc/source/core/tool/scmatrix.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e4de059c53dc2cc6547e7af55789aee4ec214c60
Author: Eike Rathke <er...@redhat.com>
Date:   Tue Jan 27 14:50:36 2015 +0100

    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.mohrh...@googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 0d5f907..aa425b3 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 bf2f163..4402002 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits