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 /sw/source/core/draw | |
| 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 'sw/source/core/draw')
| -rw-r--r-- | sw/source/core/draw/dcontact.cxx | 10 | ||||
| -rw-r--r-- | sw/source/core/draw/dview.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 41cd1ebef26f..132d8f83662e 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -175,7 +175,7 @@ SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj ) SwContact* GetUserCall( const SdrObject* pObj ) { SdrObject *pTmp; - while ( !pObj->GetUserCall() && nullptr != (pTmp = pObj->GetUpGroup()) ) + while ( !pObj->GetUserCall() && nullptr != (pTmp = pObj->getParentSdrObjectFromSdrObject()) ) pObj = pTmp; assert((!pObj->GetUserCall() || nullptr != dynamic_cast<const SwContact*>(pObj->GetUserCall())) && "<::GetUserCall(..)> - wrong type of found object user call." ); @@ -1223,12 +1223,12 @@ void SwDrawContact::Changed_( const SdrObject& rObj, // If drawing object is a member of a group, the adjustment // of the positioning and the alignment attributes has to // be done for the top group object. - if ( rObj.GetUpGroup() ) + if ( rObj.getParentSdrObjectFromSdrObject() ) { - const SdrObject* pGroupObj = rObj.GetUpGroup(); - while ( pGroupObj->GetUpGroup() ) + const SdrObject* pGroupObj = rObj.getParentSdrObjectFromSdrObject(); + while ( pGroupObj->getParentSdrObjectFromSdrObject() ) { - pGroupObj = pGroupObj->GetUpGroup(); + pGroupObj = pGroupObj->getParentSdrObjectFromSdrObject(); } // use geometry of drawing object aObjRect = pGroupObj->GetSnapRect(); diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 60511cda2594..94c384b57486 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -429,7 +429,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, size_t nOldPos, size_t nNewPos ) { // nothing to do for group members - if ( pObj->GetUpGroup() ) + if ( pObj->getParentSdrObjectFromSdrObject() ) { return; } |