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

[Eike Rathke]

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

New commits:
commit 7dcd3a825ce521dc799cd5794c938a6d62276160
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Oct 21 18:45:18 2015 +0200

    Resolves: tdf#95226 fix broken IFERROR/IFNA array logic
    
    Change-Id: I059248659f51746cfc1d06faeaadaf3d645c03d3
    (cherry picked from commit 968e2faff6d4283dacd9010d31cb4c0df45eb7c5)
    Reviewed-on: https://gerrit.libreoffice.org/19523
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e86b955..56b8ce1 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -349,11 +349,11 @@ void ScInterpreter::ScIfError( bool bNAonly )
                     SCSIZE nC = 0, nR = 0;
                     for ( ; nC < nCols && (nC != nErrorCol || nR != nErrorRow); /*nop*/ )
                     {
-                        for ( ; nR < nRows && (nC != nErrorCol || nR != nErrorRow); ++nR)
+                        for (nR = 0 ; nR < nRows && (nC != nErrorCol || nR != nErrorRow); ++nR)
                         {
                             lcl_storeJumpMatResult(pMatPtr, pJumpMat, nC, nR);
                         }
-                        if (nC != nErrorCol || nR != nErrorRow)
+                        if (nC != nErrorCol && nR != nErrorRow)
                             ++nC;
                     }
                     // Now the mixed cases.
@@ -371,6 +371,7 @@ void ScInterpreter::ScIfError( bool bNAonly )
                                 lcl_storeJumpMatResult(pMatPtr, pJumpMat, nC, nR);
                             }
                         }
+                        nR = 0;
                     }
                     xNew = new ScJumpMatrixToken( pJumpMat );
                     GetTokenMatrixMap().insert( ScTokenMatrixMap::value_type( pCur, xNew ));
commit da67c46896fc5de1798a2cf3da4ee38bf5517bea
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Oct 27 21:36:56 2015 +0100

    Updated core
    Project: translations  e30b29121db2a07bb33c154eebc4e2f5f1ef745d
    
    update translations for 4.4.6 rc3
    
    and force-fix errors using pocheck
    
    Change-Id: I59590ceef310129ea4700839a01c3119317733f2

diff --git a/translations b/translations
index 1c777d9..e30b291 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 1c777d9197fddb11d7bb16042bd2759f18e5eeb1
+Subproject commit e30b29121db2a07bb33c154eebc4e2f5f1ef745d