INTEGRATION: CWS swcolsel (1.16.52); FILE MERGED

2007/11/12 16:16:50 ama 1.16.52.5: Fix #i83520#: Block insertion
2007/11/08 12:28:00 ama 1.16.52.4: Fix #83258#: Deletion functionality with BlockCursor
2007/11/08 10:36:10 ama 1.16.52.3: Fix #i83253#i83258#: Block cursor and deletion
2007/10/06 02:44:42 ama 1.16.52.2: RESYNC: (1.16-1.17); FILE MERGED
2007/09/04 13:01:20 ama 1.16.52.1: Fix #i1596#: Don't leave block selection

1 files changed, 43 insertions, 19 deletions

diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index 15389e896070..b3cc4d2b37f3 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: delete.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: hr $ $Date: 2007-09-27 12:52:35 $
+ *  last change: $Author: ihi $ $Date: 2007-11-22 15:42:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -193,16 +193,28 @@ long SwWrtShell::DelLeft()
     // wenn eine Selektion existiert, diese loeschen.
     if ( IsSelection() )
     {
-         //OS: wieder einmal Basic: ACT_KONTEXT muss vor
-        //EnterStdMode verlassen werden!
+        if( !IsBlockMode() || HasSelection() )
         {
-            ACT_KONTEXT(this);
-            ResetCursorStack();
-            Delete();
-            UpdateAttr();
+             //OS: wieder einmal Basic: ACT_KONTEXT muss vor
+            //EnterStdMode verlassen werden!
+            {
+                ACT_KONTEXT(this);
+                ResetCursorStack();
+                Delete();
+                UpdateAttr();
+            }
+            if( IsBlockMode() )
+            {
+                NormalizePam();
+                ClearMark();
+                EnterBlockMode();
+            }
+            else
+                EnterStdMode();
+            return 1L;
         }
-        EnterStdMode();
-        return 1L;
+        else
+            EnterStdMode();
     }
 
     // JP 29.06.95: nie eine davor stehende Tabelle loeschen.
@@ -277,17 +289,29 @@ long SwWrtShell::DelRight()
             //  wenn eine Selektion existiert, diese loeschen.
         if( IsSelection() )
         {
-            //OS: wieder einmal Basic: ACT_KONTEXT muss vor
-            //EnterStdMode verlassen werden!
+            if( !IsBlockMode() || HasSelection() )
             {
-                ACT_KONTEXT(this);
-                ResetCursorStack();
-                Delete();
-                UpdateAttr();
+                //OS: wieder einmal Basic: ACT_KONTEXT muss vor
+                //EnterStdMode verlassen werden!
+                {
+                    ACT_KONTEXT(this);
+                    ResetCursorStack();
+                    Delete();
+                    UpdateAttr();
+                }
+                if( IsBlockMode() )
+                {
+                    NormalizePam();
+                    ClearMark();
+                    EnterBlockMode();
+                }
+                else
+                    EnterStdMode();
+                nRet = 1L;
+                break;
             }
-            EnterStdMode();
-            nRet = 1L;
-            break;
+            else
+                EnterStdMode();
         }
 
         pWasInTblNd = IsCrsrInTbl();