diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-01-16 11:19:45 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-01-16 11:22:15 -0500 |
| commit | c5fc0af6f551980d3e147f7d6cf1fdd320b8f1fe (patch) | |
| tree | 1ffd5504f1a9ad064771d84305dbfd4b6c32cac7 /sd/source/ui | |
| parent | 05923e058a6b90f05c90d5f9aef4de58233a51ac (diff) | |
Remove GetAllMarkedModel() since all it does is call GetMarkedObjModel().
One less indirection makes the code a tad easier to follow.
Change-Id: I8e1113617c09f91c0cad32277ee4e32c78f9f058
Diffstat (limited to 'sd/source/ui')
| -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 |
3 files changed, 4 insertions, 4 deletions
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 ) |