diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/drawdoc3.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/app/sdxfer.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 9909623385a3..a3ff2ec52dd3 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1066,7 +1066,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject( if (bOLEObjFound) pBMView->GetDoc().SetAllocDocSh(sal_True); - SdDrawDocument* pTmpDoc = (SdDrawDocument*) pBMView->GetAllMarkedModel(); + SdDrawDocument* pTmpDoc = (SdDrawDocument*) pBMView->GetMarkedObjModel(); bOK = pView->Paste(*pTmpDoc, aObjPos, pPage); if (bOLEObjFound) diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index fffbf29f834f..c4a9c0dd4ad8 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -286,7 +286,7 @@ void SdTransferable::CreateData() if( mpSourceDoc ) mpSourceDoc->CreatingDataObj(this); - mpSdDrawDocumentIntern = (SdDrawDocument*) mpSdView->GetAllMarkedModel(); + mpSdDrawDocumentIntern = (SdDrawDocument*) mpSdView->GetMarkedObjModel(); if( mpSourceDoc ) mpSourceDoc->CreatingDataObj(0); @@ -509,7 +509,7 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) { SdDrawDocument& rInternDoc = mpSdViewIntern->GetDoc(); rInternDoc.CreatingDataObj(this); - SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( mpSdViewIntern->GetAllMarkedModel() ); + SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( mpSdViewIntern->GetMarkedObjModel() ); rInternDoc.CreatingDataObj(0); bOK = SetObject( pDoc, SDTRANSFER_OBJECTTYPE_DRAWMODEL, rFlavor ); diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index e664c01473e2..e7b82835a827 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -107,7 +107,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent SD_MOD()->pTransferClip = pTransferable; mrDoc.CreatingDataObj( pTransferable ); - pTransferable->SetWorkDocument( (SdDrawDocument*) GetAllMarkedModel() ); + pTransferable->SetWorkDocument( (SdDrawDocument*) GetMarkedObjModel() ); mrDoc.CreatingDataObj( NULL ); // #112978# need to use GetAllMarkedBoundRect instead of GetAllMarkedRect to get diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index c19789e6e3cc..f6a59d691dcc 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -591,7 +591,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, // model is owned by from AllocModel() created DocShell SdDrawDocument* pSourceDoc = (SdDrawDocument*) pSourceView->GetModel(); pSourceDoc->CreatingDataObj( pOwnData ); - SdDrawDocument* pModel = (SdDrawDocument*) pSourceView->GetAllMarkedModel(); + SdDrawDocument* pModel = (SdDrawDocument*) pSourceView->GetMarkedObjModel(); bReturn = Paste( *pModel, maDropPos, pPage, nPasteOptions ); if( !pPage ) |