summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chart2/source/controller/main/ChartTransferable.cxx2
-rw-r--r--sc/source/ui/app/seltrans.cxx2
-rw-r--r--sc/source/ui/navipi/content.cxx2
-rw-r--r--sc/source/ui/view/drawvie4.cxx6
-rw-r--r--sd/source/core/drawdoc3.cxx2
-rw-r--r--sd/source/ui/app/sdxfer.cxx4
-rw-r--r--sd/source/ui/view/sdview2.cxx2
-rw-r--r--sd/source/ui/view/sdview3.cxx2
-rw-r--r--svx/inc/svx/svdxcgv.hxx1
9 files changed, 11 insertions, 12 deletions
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index 6a987d077ca8..efc9782c1874 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -58,7 +58,7 @@ ChartTransferable::ChartTransferable( SdrModel* pDrawModel, SdrObject* pSelected
m_xMetaFileGraphic.set( aGraphic.GetXGraphic());
if ( m_bDrawing )
{
- m_pMarkedObjModel = ( pExchgView ? pExchgView->GetAllMarkedModel() : NULL );
+ m_pMarkedObjModel = ( pExchgView ? pExchgView->GetMarkedObjModel() : NULL );
}
delete pExchgView;
}
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
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 )
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index 4918df0c16ad..1d7a16102164 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -83,7 +83,6 @@ public:
virtual SdrModel* GetMarkedObjModel() const;
Graphic GetAllMarkedGraphic() const;
- SdrModel* GetAllMarkedModel() const { return GetMarkedObjModel(); }
/** Generate a Graphic for the given draw object in the given model
generated by cgit (git 2.34.1) at 2024-08-01 12:36:35 +0000