[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-1' - sc/source

[Łukasz Hryniuk]

 sc/source/core/tool/interpr5.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4fed84924adc6afbc03b5458f63fc49ba505dd5a
Author: Łukasz Hryniuk <lukasz.hryniuk at wp.pl>
Date:   Sat Aug 8 16:04:01 2015 +0200

    tdf#89387 related, fix SumSquare bug in SumMXMY2
    
    SumSquare returns IterateResult, which, because of rounding errors, store
    first value in mfFirst and rest in mfRest. They should be added to get
    the full sum of square of matrices difference.
    
    Change-Id: I9bc435801d94206960b0b4fe4a9149ef1abeb3be
    Reviewed-on: https://gerrit.libreoffice.org/17592
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit d5bff1225a6739e8369bacd8392686bd26630d2f)
    Reviewed-on: https://gerrit.libreoffice.org/17639
    (cherry picked from commit e67bbe231f875477b16f3fe51dcf14e3711a73a5)
    Reviewed-on: https://gerrit.libreoffice.org/17640
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 8397a0e..c0606a9 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1788,7 +1788,7 @@ void ScInterpreter::ScSumXMY2()
     else
     {
         ScMatrix::IterateResult aRes = pResMat->SumSquare(false);
-        double fSum = aRes.mfRest;
+        double fSum = aRes.mfFirst + aRes.mfRest;
         PushDouble(fSum);
     }
 }