[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source
Oliver Specht
oliver.specht at cib.de
Tue Oct 20 04:06:12 PDT 2015
sw/source/uibase/docvw/edtwin.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2b766197bdf195789ac126899e1b117bc759b72a
Author: Oliver Specht <oliver.specht at cib.de>
Date: Thu Oct 15 18:55:55 2015 +0200
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 at libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht at cib.de>
(cherry picked from commit ac427caf1069ff66b4893bb2e937c2408d7c37b3)
Reviewed-on: https://gerrit.libreoffice.org/19453
Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 388ca50..a76f6875 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:
More information about the Libreoffice-commits
mailing list