[Libreoffice-commits] core.git: Branch 'feature/fixes14' - sc/source

[Tor Lillqvist]

 sc/source/core/tool/scmatrix.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit ec1d3b7f32441d49ea2f2aefb7637d47694f98a8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 5 16:54:54 2016 +0200

    Further fix for 68b18511dd4468d9705e94812869410a03922c2f
    
    Will be squashed in master and actual 5-1.
    
    Change-Id: Ic6a9da8a280e9cc28d8450adacb67f4567aa6b0d

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index f5df7c3..6018ca1 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -3434,11 +3434,10 @@ ScMatrix::IterateResult ScVectorRefMatrix::Sum(bool bTextAsZero) const
                 }
             }
             p += i;
-            nDataSize -= i;
-            if (nDataSize == 0)
+            if (i == nDataSize)
                 continue;
 
-            sc::ArraySumFunctor functor(p, nDataSize);
+            sc::ArraySumFunctor functor(p, nDataSize-i);
 
             mfRest += functor();
         }