From 52863b2d654f79af0bb9d4fac762137979e5047a Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Thu, 14 Aug 2008 18:44:36 +0000
Subject: INTEGRATION: CWS tl58 (1.21.186); FILE MERGED 2008/08/06 10:11:36 od
 1.21.186.1: #i92468# Deletion of previous respectively next word 	 -
 perform former (before fix for issue i72162) code for deletion 	   of
 previous respectively next word.

---
 sw/source/ui/wrtsh/delete.cxx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'sw/source/ui/wrtsh')

diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index 3406a3107e99..30536bf1fec8 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: delete.cxx,v $
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -513,9 +513,9 @@ long SwWrtShell::DelNxtWord()
     EnterStdMode();
     SetMark();
     if(IsEndWrd() && !IsSttWrd())
-        _NxtWrd();
+        _NxtWrdForDelete(); // --> OD 2008-08-06 #i92468#
     if(IsSttWrd() || IsEndPara())
-        _NxtWrd();
+        _NxtWrdForDelete(); // --> OD 2008-08-06 #i92468#
     else
         _EndWrd();
 
@@ -538,11 +538,12 @@ long SwWrtShell::DelPrvWord()
     ResetCursorStack();
     EnterStdMode();
     SetMark();
-    if( !IsSttWrd() || !_PrvWrd() )
+    if ( !IsSttWrd() ||
+         !_PrvWrdForDelete() ) // --> OD 2008-08-06 #i92468#
     {
         if( IsEndWrd() )
         {
-            if( _PrvWrd() )
+            if ( _PrvWrdForDelete() ) // --> OD 2008-08-06 #i92468#
             {
                 // skip over all-1 spaces
                 short n = -1;
@@ -554,7 +555,7 @@ long SwWrtShell::DelPrvWord()
             }
         }
         else if( IsSttPara())
-            _PrvWrd();
+            _PrvWrdForDelete(); // --> OD 2008-08-06 #i92468#
         else
             _SttWrd();
     }
-- 
cgit