[Libreoffice-commits] core.git: sw/source

[Julien Nabet]

 sw/source/core/uibase/wrtsh/delete.cxx |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 6651a2493d72f2bd0613b96ee5276a1270709630
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat May 3 20:29:26 2014 +0200

    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 at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/uibase/wrtsh/delete.cxx b/sw/source/core/uibase/wrtsh/delete.cxx
index 0aba759..dcb9d4c 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();