INTEGRATION: CWS aw024 (1.21.158); FILE MERGED

2006/09/22 02:08:20 aw 1.21.158.7: RESYNC: (1.25-1.26); FILE MERGED
2006/05/12 21:58:36 aw 1.21.158.6: RESYNC: (1.24-1.25); FILE MERGED
2005/11/18 15:44:34 aw 1.21.158.5: RESYNC: (1.23-1.24); FILE MERGED
2005/09/17 21:15:43 aw 1.21.158.4: RESYNC: (1.22-1.23); FILE MERGED
2005/07/22 10:32:11 aw 1.21.158.3: RESYNC: (1.21-1.22); FILE MERGED
2005/05/19 12:15:22 aw 1.21.158.2: #i39529#
2005/05/12 16:49:35 aw 1.21.158.1: #i39529#

sw/source/ui/docvw/edtdd.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: edtdd.cxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 22:52:18 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 15:16:04 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,9 +48,9 @@
 #ifndef _OUTLINER_HXX //autogen
 #include <svx/outliner.hxx>
 #endif
-#ifndef _SVDVMARK_HXX //autogen
-#include <svx/svdvmark.hxx>
-#endif
+//#ifndef _SVDVMARK_HXX //autogen
+//#include <svx/svdvmark.hxx>
+//#endif
 #ifndef _SVDOBJ_HXX //autogen
 #include <svx/svdobj.hxx>
 #endif
@@ -236,7 +236,8 @@ void SwEditWin::CleanupDropUserMarker()
 {
     if ( pUserMarker )
     {
-        delete pUserMarker, pUserMarker = 0;
+        delete pUserMarker;
+        pUserMarker = 0;
         pUserMarkerObj = 0;
     }
 }
@@ -522,15 +523,16 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
         else
         {
             rSh.UnSetVisCrsr();
-            if ( !pUserMarker )
-                pUserMarker = new SdrViewUserMarker( rSh.GetDrawView() );
+
             if ( pUserMarkerObj != pObj )
             {
+                CleanupDropUserMarker();
                 pUserMarkerObj = pObj;
-                pUserMarker->SetXPolyPolygon( pUserMarkerObj,
-                    rSh.GetDrawView()->GetPageView(
-                            rSh.GetDrawView()->GetModel()->GetPage(0)));
-                pUserMarker->Show();
+
+                if(pUserMarkerObj)
+                {
+                    pUserMarker = new SdrDropMarkerOverlay( *rSh.GetDrawView(), *pUserMarkerObj );
+                }
             }
         }
         return nUserOpt;