diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-06-16 13:23:08 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-06-16 17:29:52 +0200 |
| commit | 099eef24da24d638fdf2c747d28040c9b3a30780 (patch) | |
| tree | a636f31a48033b3164db59e057ce68d22c708edb /sd | |
| parent | a4cd8bfea486327279d6d2a3bacc3e06e5df2745 (diff) | |
AW080: Continued cleanups/remaps/corrections
Change-Id: I953f29e6a8d398e00884a600d6f4ceba880489a5
Reviewed-on: https://gerrit.libreoffice.org/55913
Tested-by: Jenkins
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 | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 6fd8671755fa..369de3136adb 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -419,7 +419,7 @@ static bool implIsInsideGroup( SdrObject const * pObj ) return false; } - SdrObjList* pSdrObjList(pObj->getParentOfSdrObject()); + SdrObjList* pSdrObjList(pObj->getParentSdrObjListFromSdrObject()); if(nullptr == pSdrObjList) { diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 5755ce31a413..539932c8e9dc 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1055,7 +1055,7 @@ void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind) const bool bUndo = pDoc->IsUndoEnabled(); if( bUndo ) pDoc->AddUndo(pDoc->GetSdrUndoFactory().CreateUndoDeleteObject(*pObject)); - SdrObjList* pOL = pObject->getParentOfSdrObject(); + SdrObjList* pOL = pObject->getParentSdrObjListFromSdrObject(); pOL->RemoveObject(pObject->GetOrdNumDirect()); if( !bUndo ) diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 6f73d9799102..62f49e13d060 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -448,7 +448,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const c if(!(aValue >>= nNavOrder)) throw lang::IllegalArgumentException(); - SdrObjList* pObjList = pObj->getParentOfSdrObject(); + SdrObjList* pObjList = pObj->getParentSdrObjListFromSdrObject(); if( pObjList ) pObjList->SetObjectNavigationPosition( *pObj, (nNavOrder < 0) ? SAL_MAX_UINT32 : static_cast< sal_uInt32 >( nNavOrder ) ); break; |