diff options
Diffstat (limited to 'sw/source/core/layout/anchoredobject.cxx')
| -rw-r--r-- | sw/source/core/layout/anchoredobject.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index 5c7bec0b44b2..eb2ef8016a22 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -86,7 +86,6 @@ SwAnchoredObject::SwAnchoredObject() : mbClearedEnvironment( false ), // --> #i3317# mbTmpConsiderWrapInfluence( false ), - mbInvalidatingObjects( false ), // --> #i68520# maObjRectWithSpaces(), mbObjRectWithSpacesValid( false ), @@ -616,12 +615,10 @@ void SwAnchoredObject::SetObjLeft( const SwTwips _nLeft) at the anchor frame and all following anchored objects on the page frame are invalidated. */ - void SwAnchoredObject::UpdateObjInSortedList() { - if ( !GetAnchorFrame() || mbInvalidatingObjects ) + if ( !GetAnchorFrame() ) return; - mbInvalidatingObjects = true; if ( GetFrameFormat().getIDocumentSettingAccess().get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) { @@ -629,10 +626,11 @@ void SwAnchoredObject::UpdateObjInSortedList() if ( GetAnchorFrame()->GetDrawObjs() ) { const SwSortedObjs* pObjs = GetAnchorFrame()->GetDrawObjs(); - for(auto it = pObjs->begin(); it != pObjs->end(); ++it) + // determine start index + for (auto it = pObjs->begin(); it != pObjs->end(); ++it) { SwAnchoredObject* pAnchoredObj = *it; - if(pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos()) + if ( pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos() ) pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence(); else pAnchoredObj->InvalidateObjPos(); @@ -661,7 +659,6 @@ void SwAnchoredObject::UpdateObjInSortedList() { GetPageFrame()->GetSortedObjs()->Update( *this ); } - mbInvalidatingObjects = false; } /** method to determine, if invalidation of position is allowed |