summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Hryniuk <lukasz.hryniuk@wp.pl>2015-08-08 16:04:01 +0200
committerNorbert Thiebaud <nthiebaud@gmail.com>2015-08-15 21:53:09 +0000
commit4fed84924adc6afbc03b5458f63fc49ba505dd5a (patch)
treebda8b87e05e1038fedd72ea547d0012ef42a55af
parent0b1dda2bfaf4f43dd347c2986f1508458dc47c6d (diff)
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@redhat.com> Tested-by: Eike Rathke <erack@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@gmail.com>
-rw-r--r--sc/source/core/tool/interpr5.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 8397a0e0aa44..c0606a9ef51d 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);
}
}