diff options
author | Oliver Specht <oliver.specht@cib.de> | 2015-10-15 18:55:55 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-10-26 16:04:03 +0100 |
commit | e53c08b6e7968d50857253e78add3ef124193bda (patch) | |
tree | 06ab259eeac2d847cfaf451b6d91af9fe94dffa8 /sw | |
parent | daba4852955278a22e750715e3341900d760895b (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>
(cherry picked from commit 2b766197bdf195789ac126899e1b117bc759b72a)
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index f60723b1f277..f392010fb6b1 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -1823,7 +1823,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; @@ -1910,7 +1910,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: |