diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-04-11 19:22:52 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-04-16 21:21:37 +0200 |
| commit | fda4b0f65eb23b597612113686a927a90f11a0f0 (patch) | |
| tree | b39c1b8abb7a6d50eee862ad01f7f999e554421f /sw/source | |
| parent | 6703b806a7d33f27bdec53d5c897beac94308fd9 (diff) | |
Take care of E3DObjList
E3DObjList is not needed, remove. Remove memeber from
E3DObject, derive E3DScene directly from SdrObjList, some
cleanups in SdrObject, too
Change-Id: Ifa4620a800c14faf21f8b80fd4dc1d39f71be804
Reviewed-on: https://gerrit.libreoffice.org/52740
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/frmedt/fecopy.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/frmedt/feshview.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index dfe4d11c834a..849787aedc01 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -928,7 +928,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc ) Imp()->GetDrawView()->InsertObjectAtView( pNew, *Imp()->GetPageView() ); Point aGrpAnchor( 0, 0 ); - SdrObjList* pList = pNew->GetObjList(); + SdrObjList* pList = pNew->getParentOfSdrObject(); if ( pList ) { SdrObject* pOwner = pList->GetOwnerObj(); @@ -1276,7 +1276,7 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SdrModel& _rModel ) if( pOle2Obj ) { // found an ole2 shape - SdrObjList* pObjList = pOle2Obj->GetObjList(); + SdrObjList* pObjList = pOle2Obj->getParentOfSdrObject(); // get its graphic Graphic aGraphic; diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 870009758321..b1b897f32d84 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1502,7 +1502,7 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, GotoObjFlags eType, bool // If an object inside a group is selected, we want to // iterate over the group members. if ( ! pStartObj->GetUserCall() ) - pList = pStartObj->GetObjList(); + pList = pStartObj->getParentOfSdrObject(); } else { diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index e0244ca88a32..5f5d9c0d4c0d 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -447,7 +447,7 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs(SwDoc& _rDoc) if( pOle2Obj ) { // found an ole2 shape - SdrObjList* pObjList = pOle2Obj->GetObjList(); + SdrObjList* pObjList = pOle2Obj->getParentOfSdrObject(); // get its graphic Graphic aGraphic; |