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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/core/EffectMigration.cxx | 2 | ||||
| -rw-r--r-- | sd/source/core/sdpage.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/animations/motionpathtag.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 59f60cb21323..305ca6e9a585 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -406,7 +406,7 @@ EffectSequence::iterator ImplFindEffect( MainSequencePtr const & pMainSequence, static bool implIsInsideGroup( SdrObject const * pObj ) { - return pObj && pObj->GetObjList() && pObj->GetObjList()->GetUpList(); + return pObj && pObj->getParentOfSdrObject() && pObj->getParentOfSdrObject()->GetUpList(); } void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEffect ) diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 472814b48f9a..fc60775f6cef 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -663,7 +663,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const slides masterpage */ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const { - OUString aStyleName( pPage->GetLayoutName() ); + OUString aStyleName( mpPage->GetLayoutName() ); const OUString aSep( SD_LT_SEPARATOR ); sal_Int32 nIndex = aStyleName.indexOf(aSep); if( nIndex != -1 ) @@ -1054,7 +1054,7 @@ void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind) const bool bUndo = pDoc->IsUndoEnabled(); if( bUndo ) pDoc->AddUndo(pDoc->GetSdrUndoFactory().CreateUndoDeleteObject(*pObject)); - SdrObjList* pOL = pObject->GetObjList(); + SdrObjList* pOL = pObject->getParentOfSdrObject(); pOL->RemoveObject(pObject->GetOrdNumDirect()); if( !bUndo ) diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index c54d991ba42a..165d67b87516 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -325,7 +325,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con if( pPage ) { mpPathObj->SetPage( pPage ); - mpPathObj->SetObjList( pPage ); + mpPathObj->setParentOfSdrObject( pPage ); } XDash aDash( css::drawing::DashStyle_RECT, 1, 80, 1, 80, 80); diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 588f4449c8a3..33e9928cafc5 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -447,7 +447,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const c if(!(aValue >>= nNavOrder)) throw lang::IllegalArgumentException(); - SdrObjList* pObjList = pObj->GetObjList(); + SdrObjList* pObjList = pObj->getParentOfSdrObject(); if( pObjList ) pObjList->SetObjectNavigationPosition( *pObj, (nNavOrder < 0) ? SAL_MAX_UINT32 : static_cast< sal_uInt32 >( nNavOrder ) ); break; |