summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2015-10-15 18:55:55 +0200
committerBjörn Michaelsen <bjoern.michaelsen@canonical.com>2015-10-20 11:05:47 +0000
commit2b766197bdf195789ac126899e1b117bc759b72a (patch)
tree91751c575149fcb2dacb9308d0ab0f7794243d32 /sw
parentb424ffd2a1233cf0832f05cde88ecf988585290e (diff)
tdf#95091: 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: Iee5ef133971a3f2967e6c92e685a16afa003cfe8 Reviewed-on: https://gerrit.libreoffice.org/19399 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> (cherry picked from commit ac427caf1069ff66b4893bb2e937c2408d7c37b3) Reviewed-on: https://gerrit.libreoffice.org/19453 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 388ca5082270..a76f68755b30 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.CrsrInsideInputField())
{
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.CrsrInsideInputField())
{
bool bDone = false;
// try to add comment for code snip: