[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 2 commits - sc/source sw/source

[Eike Rathke]

 sc/source/core/tool/interpr1.cxx  |    5 +++--
 sw/source/uibase/docvw/edtwin.cxx |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit a2a8949470dc6e23b8e50ca46b3fbdc0edb242d5
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/19522
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 748ff17f7780232729d60ef764b0f2995b887b22)

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 451f3191c5e61cb24bb31687227620e213aa582a
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Mon Oct 19 15:14:10 2015 +0200

    tdf#64432: enable delete and backspace in editable elements within protections
    
    when editing is enabled also delete and backspace should be possible
    this applies e.g. to input fields within protected sections
    
    Change-Id: Ia2a95d272cf22aa7f1b2a8e005e9a46373aee080
    Reviewed-on: https://gerrit.libreoffice.org/19480
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    (cherry picked from commit eb0d47c372366da812e8dd1a54f772f1d43e9310)

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 7d16052..351d422 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1822,7 +1822,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     break;
 
                 case KEY_DELETE:
-                    if ( !rSh.HasReadonlySel() )
+                    if ( !rSh.HasReadonlySel() || rSh.CrsrInsideInputFld())
                     {
                         if (rSh.IsInFrontOfLabel() && rSh.NumOrNoNum(false))
                             eKeyState = KS_NumOrNoNum;
@@ -1909,7 +1909,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 break;
                 case KEY_BACKSPACE:
                 case KEY_BACKSPACE | KEY_SHIFT:
-                    if ( !rSh.HasReadonlySel() )
+                    if ( !rSh.HasReadonlySel() || rSh.CrsrInsideInputFld())
                     {
                         bool bDone = false;
                         // try to add comment for code snip: