INTEGRATION: CWS impresstables2 (1.31.72); FILE MERGED

2008/01/01 18:37:13 cl 1.31.72.2: #i68103# working on tables
2007/12/16 17:59:09 cl 1.31.72.1: #i72702# working on table clipboard

svx/source/svdraw/svdxcgv.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: svdxcgv.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 19:13:35 $
+ *  last change: $Author: rt $ $Date: 2008-03-12 09:57:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -332,6 +332,15 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
 {
     const SdrModel* pSrcMod=&rMod;
     if (pSrcMod==pMod) return FALSE; // na so geht's ja nun nicht
+
+    BegUndo(ImpGetResStr(STR_ExchangePaste));
+
+    if( mxSelectionController.is() && mxSelectionController->PasteObjModel( rMod ) )
+    {
+        EndUndo();
+        return TRUE;
+    }
+
     Point aPos(rPos);
     ImpGetPasteObjList(aPos,pLst);
     SdrPageView* pMarkPV=NULL;
@@ -362,7 +371,6 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
     }
     SdrObjList*  pDstLst=pLst;
     USHORT nPg,nPgAnz=pSrcMod->GetPageCount();
-    BegUndo(ImpGetResStr(STR_ExchangePaste));
     for (nPg=0; nPg<nPgAnz; nPg++) {
         const SdrPage* pSrcPg=pSrcMod->GetPage(nPg);
 
@@ -755,6 +763,8 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
     SdrPage* pNeuPag=pNeuMod->AllocPage(FALSE);
     pNeuMod->InsertPage(pNeuPag);
 
+    if( !mxSelectionController.is() || !mxSelectionController->GetMarkedObjModel( pNeuPag ) )
+    {
         ::std::vector< ::std::vector< SdrMark* > >  aObjVectors( 2 );
         ::std::vector< SdrMark* >&                  rObjVector1 = aObjVectors[ 0 ];
         ::std::vector< SdrMark* >&                  rObjVector2 = aObjVectors[ 1 ];
@@ -842,6 +852,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
             DBG_ERROR(aStr.GetBuffer());
 #endif
         }
+    }
     return pNeuMod;
 }