INTEGRATION: CWS aw024 (1.29.96); FILE MERGED

2006/11/10 05:22:50 aw 1.29.96.12: RESYNC: (1.41-1.42); FILE MERGED
2006/09/22 00:54:55 aw 1.29.96.11: RESYNC: (1.40-1.41); FILE MERGED
2006/09/08 19:35:46 aw 1.29.96.10: RESYNC: (1.39-1.40); FILE MERGED
2006/08/03 16:54:42 aw 1.29.96.9: RESYNC: (1.38-1.39); FILE MERGED
2006/05/12 21:23:53 aw 1.29.96.8: RESYNC: (1.36-1.38); FILE MERGED
2005/11/18 15:11:35 aw 1.29.96.7: RESYNC: (1.34-1.36); FILE MERGED
2005/09/17 18:34:45 aw 1.29.96.6: RESYNC: (1.33-1.34); FILE MERGED
2005/05/26 11:30:35 aw 1.29.96.5: #i39531#
2005/05/19 12:15:15 aw 1.29.96.4: #i39529#
2005/05/13 14:57:16 aw 1.29.96.3: RESYNC: (1.32-1.33); FILE MERGED
2005/03/23 21:03:19 aw 1.29.96.2: RESYNC: (1.29-1.32); FILE MERGED
2004/12/27 10:06:24 aw 1.29.96.1: #i39525

sw/source/core/frmedt/fecopy.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fecopy.cxx,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: vg $ $Date: 2006-09-25 09:27:53 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 15:09:23 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -199,6 +199,9 @@
 #include <mvsave.hxx>
 #endif
 
+#ifndef _SV_VIRDEV_HXX
+#include <vcl/virdev.hxx>
+#endif
 
 /*************************************************************************
 |*
@@ -492,7 +495,7 @@ BOOL SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                 SdrObject* pNew = pDestDoc->CloneSdrObj( *pObj, bIsMove &&
                                         GetDoc() == pDestDoc, FALSE );
                 pNew->NbcMove( aSiz );
-                pDestDrwView->InsertObject( pNew, *pDestPgView );
+                pDestDrwView->InsertObjectAtView( pNew, *pDestPgView );
                 bInsWithFmt = FALSE;
             }
         }
@@ -979,8 +982,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
                             pNew->NbcSetSnapRect( aSnapRect );
                         }
 
-                        Imp()->GetDrawView()->InsertObject( pNew,
-                                                        *Imp()->GetPageView() );
+                        Imp()->GetDrawView()->InsertObjectAtView( pNew, *Imp()->GetPageView() );
 
                         Point aGrpAnchor( 0, 0 );
                         SdrObjList* pList = pNew->GetObjList();
@@ -1058,7 +1060,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
                             // <--
                             SdrObject *pObj = pNew->FindSdrObject();
                             SwDrawView  *pDV = Imp()->GetDrawView();
-                            pDV->MarkObj( pObj, pDV->GetPageView( pObj->GetPage() ) );
+                            pDV->MarkObj( pObj, pDV->GetSdrPageView() );
                             // --> OD 2005-04-15 #i47455# - notify draw frame format
                             // that position attributes are already set.
                             if ( pNew->ISA(SwDrawFrmFmt) )
@@ -1398,7 +1400,6 @@ void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt )
     FmFormModel* pModel = new FmFormModel( aPathOpt.GetPalettePath(),
                                             0, GetDoc()->GetDocShell() );
     pModel->GetItemPool().FreezeIdRanges();
-//BFS04 pModel->SetStreamingSdrModel(TRUE);
 
     rStrm.Seek(0);
 
@@ -1504,8 +1505,7 @@ void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt )
                     pFmt = GetDoc()->Insert( *GetCrsr(), *pNewObj, &aFrmSet, NULL );
                 }
                 else
-                    pView->ReplaceObject( pOldObj, *Imp()->GetPageView(),
-                                            pNewObj, TRUE );
+                    pView->ReplaceObjectAtView( pOldObj, *Imp()->GetPageView(), pNewObj, TRUE );
             }
             break;