summaryrefslogtreecommitdiff
path: root/sw/source/core/uibase/wrtsh
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-05-03 20:29:26 +0200
committerMichael Stahl <mstahl@redhat.com>2014-05-09 11:51:55 +0000
commit6651a2493d72f2bd0613b96ee5276a1270709630 (patch)
tree64bed0cd9bc47d147638fef2ff1baa41934ce8d3 /sw/source/core/uibase/wrtsh
parent37d764bce9eb5d5f126464ca566594e108719ea7 (diff)
Resolves: fdo#78150 Ctrl+Backspace does not erase first character
See https://bugs.freedesktop.org/show_bug.cgi?id=78150#c1 and https://bugs.freedesktop.org/show_bug.cgi?id=78150#c2 1) there's a wrong conversion with negative number given to a xub_StrLen parameter, anyway it works on 4.2 2) The existing code can be simplified since we don't need to remove spaces before the word to delete Change-Id: I7e2510038666018059a54ac09c1a599154084b48 Reviewed-on: https://gerrit.libreoffice.org/9245 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/source/core/uibase/wrtsh')
-rw-r--r--sw/source/core/uibase/wrtsh/delete.cxx15
1 files changed, 1 insertions, 14 deletions
diff --git a/sw/source/core/uibase/wrtsh/delete.cxx b/sw/source/core/uibase/wrtsh/delete.cxx
index 0aba7590bc6c..dcb9d4c52d0c 100644
--- a/sw/source/core/uibase/wrtsh/delete.cxx
+++ b/sw/source/core/uibase/wrtsh/delete.cxx
@@ -516,20 +516,7 @@ long SwWrtShell::DelPrvWord()
if ( !IsSttWrd() ||
!_PrvWrdForDelete() ) // #i92468#
{
- if( IsEndWrd() )
- {
- if ( _PrvWrdForDelete() ) // #i92468#
- {
- // skip over all spaces
- short n = 0;
- while( ' ' == GetChar( false, n ))
- --n;
-
- if( ++n )
- ExtendSelection( false, -n );
- }
- }
- else if( IsSttPara())
+ if (IsEndWrd() || IsSttPara())
_PrvWrdForDelete(); // #i92468#
else
_SttWrd();