INTEGRATION: CWS aw024 (1.19.50); FILE MERGED

2006/09/08 20:35:04 aw 1.19.50.7: RESYNC: (1.26-1.27); FILE MERGED
2006/08/03 17:04:08 aw 1.19.50.6: RESYNC: (1.25-1.26); FILE MERGED
2006/05/12 22:03:16 aw 1.19.50.5: RESYNC: (1.22-1.25); FILE MERGED
2006/01/26 21:19:11 aw 1.19.50.4: RESYNC: (1.21-1.22); FILE MERGED
2005/09/17 21:52:44 aw 1.19.50.3: RESYNC: (1.20-1.21); FILE MERGED
2005/07/22 10:34:02 aw 1.19.50.2: RESYNC: (1.19-1.20); FILE MERGED
2005/05/19 12:15:23 aw 1.19.50.1: #i39529#

sw/source/ui/inc/edtwin.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: edtwin.hxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: hr $ $Date: 2006-08-14 17:41:00 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 15:17:08 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -59,7 +59,6 @@ class   SwView;
 class   SwRect;
 class   ViewShell;
 class   SwAnchorMarker;
-class   SdrViewUserMarker;
 class   SdrObject;
 class   SwShadowCursor;
 class   DataChangedEvent;
@@ -68,6 +67,7 @@ class   SvxAutoCorrect;
 class   SwPaM;
 struct  SwApplyTemplate;
 struct  QuickHelpData;
+class SdrDropMarkerOverlay;
 
 /*--------------------------------------------------------------------
     Beschreibung:   Eingabe-Fenster
@@ -121,10 +121,10 @@ friend void     PageNumNotify(  ViewShell* pVwSh,
     SwApplyTemplate     *pApplyTempl;
     SwAnchorMarker      *pAnchorMarker; // zum Verschieben eines Ankers
 
-    SdrViewUserMarker   *pUserMarker;
-    SdrObject           *pUserMarkerObj;
-    SwShadowCursor      *pShadCrsr;
-    Point               *pRowColumnSelectionStart; // save position where table row/column selection has been started
+    SdrDropMarkerOverlay    *pUserMarker;
+    SdrObject               *pUserMarkerObj;
+    SwShadowCursor          *pShadCrsr;
+    Point                   *pRowColumnSelectionStart; // save position where table row/column selection has been started
 
     SwView         &rView;