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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/ui/app/seltrans.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/navipi/content.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/drawvie4.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 1c4ec971afe6..2c200e21630e 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -340,7 +340,7 @@ void ScSelectionTransferObj::CreateDrawData() //--------------------------------------------------------- ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); - SdrModel* pModel = pDrawView->GetAllMarkedModel(); + SdrModel* pModel = pDrawView->GetMarkedObjModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); ScViewData* pViewData = pView->GetViewData(); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 1e1c909ec211..cb94bdbd0982 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -1049,7 +1049,7 @@ static void lcl_DoDragObject( ScDocShell* pSrcShell, const String& rName, sal_uI SdrPageView* pPV = aEditView.GetSdrPageView(); aEditView.MarkObj(pObject, pPV); - SdrModel* pDragModel = aEditView.GetAllMarkedModel(); + SdrModel* pDragModel = aEditView.GetMarkedObjModel(); TransferableObjectDescriptor aObjDesc; pSrcShell->FillTransferableObjectDescriptor( aObjDesc ); diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 234fbbc36b93..cf5dbe989c91 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -107,7 +107,7 @@ sal_Bool ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos ) aDragShellRef->DoInitNew(NULL); } ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); - SdrModel* pModel = GetAllMarkedModel(); + SdrModel* pModel = GetMarkedObjModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); // Charts now always copy their data in addition to the source reference, so @@ -144,7 +144,7 @@ void ScDrawView::DoCopy() // update ScGlobal::pDrawClipDocShellRef ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc( bAnyOle ) ); - SdrModel* pModel = GetAllMarkedModel(); + SdrModel* pModel = GetMarkedObjModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); // Charts now always copy their data in addition to the source reference, so @@ -180,7 +180,7 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable() // update ScGlobal::pDrawClipDocShellRef ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc( bAnyOle ) ); - SdrModel* pModel = GetAllMarkedModel(); + SdrModel* pModel = GetMarkedObjModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); // Charts now always copy their data in addition to the source reference, so |