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

[Oliver Specht]

 sw/source/uibase/docvw/edtwin.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 536a614b53f7597faaa3abc0c61db6f3dde4501f
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/19454
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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: