diff options
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/drawdoc3.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/View.hxx | 3 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/view/sdview3.cxx | 10 |
4 files changed, 9 insertions, 11 deletions
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index f63295c7f410..41f091979fc3 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1107,7 +1107,7 @@ bool SdDrawDocument::InsertBookmarkAsObject( pBMView->GetDoc().SetAllocDocSh(true); SdDrawDocument* pTmpDoc = static_cast<SdDrawDocument*>( pBMView->GetMarkedObjModel() ); - bOK = pView->Paste(*pTmpDoc, aObjPos, pPage, SdrInsertFlags::NONE, OUString(), OUString()); + bOK = pView->Paste(*pTmpDoc, aObjPos, pPage, SdrInsertFlags::NONE); if (bOLEObjFound) pBMView->GetDoc().SetAllocDocSh(false); diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 5c9aef618ccd..5d65ddad74f5 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -183,8 +183,7 @@ public: virtual SdrModel* GetMarkedObjModel() const override; virtual bool Paste( - const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions, - const OUString& rSrcShellID, const OUString& rDestShellID ) override; + const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions) override; using SdrExchangeView::Paste; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 9cd5e901ce64..5caafe9165e2 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -937,10 +937,9 @@ SdrModel* View::GetMarkedObjModel() const } bool View::Paste( - const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions, - const OUString& rSrcShellID, const OUString& rDestShellID ) + const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions) { - return FmFormView::Paste(rMod, rPos, pLst, nOptions, rSrcShellID, rDestShellID); + return FmFormView::Paste(rMod, rPos, pLst, nOptions); } } // end of namespace sd diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 2dc792a7b644..7e5ec285e6c1 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -605,7 +605,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, SdDrawDocument* pSourceDoc = static_cast<SdDrawDocument*>( pSourceView->GetModel() ); pSourceDoc->CreatingDataObj( pOwnData ); SdDrawDocument* pModel = static_cast<SdDrawDocument*>( pSourceView->GetMarkedObjModel() ); - bReturn = Paste(*pModel, maDropPos, pPage, nPasteOptions, OUString(), OUString()); + bReturn = Paste(*pModel, maDropPos, pPage, nPasteOptions); if( !pPage ) pPage = static_cast<SdPage*>( GetSdrPageView()->GetPage() ); @@ -646,7 +646,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, pWorkModel->DeletePage( (sal_uInt16) i ); } - bReturn = Paste(*pWorkModel, maDropPos, pPage, nPasteOptions, OUString(), OUString()); + bReturn = Paste(*pWorkModel, maDropPos, pPage, nPasteOptions); if( !pPage ) pPage = static_cast<SdPage*>( GetSdrPageView()->GetPage() ); @@ -807,7 +807,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, maDropPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); } - bReturn = Paste(*pModel, maDropPos, pPage, nPasteOptions, OUString(), OUString()); + bReturn = Paste(*pModel, maDropPos, pPage, nPasteOptions); } xShell->DoClose(); @@ -890,7 +890,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, pModel->DeletePage( (sal_uInt16) i ); } - bReturn = Paste(*pModel, maDropPos, pPage, nPasteOptions, OUString(), OUString()); + bReturn = Paste(*pModel, maDropPos, pPage, nPasteOptions); if( !pPage ) pPage = static_cast<SdPage*>(GetSdrPageView()->GetPage()); @@ -1515,7 +1515,7 @@ bool View::PasteRTFTable( ::tools::SvRef<SotStorageStream> xStm, SdrPage* pPage, pModel->setUnoModel( Reference< XInterface >::query( xComponent ) ); CreateTableFromRTF( *xStm, pModel.get() ); - bool bRet = Paste(*pModel, maDropPos, pPage, nPasteOptions, OUString(), OUString()); + bool bRet = Paste(*pModel, maDropPos, pPage, nPasteOptions); xComponent->dispose(); xComponent.clear(); |