summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/objectformattertxtfrm.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-07-30 10:35:22 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-08-01 11:43:08 +0200
commita0ec43251e8b8a0805306ca5ad86794550916fce (patch)
tree4ed3dd954b43a2ea1946473edba9f6963350d25c /sw/source/core/layout/objectformattertxtfrm.cxx
parentda64ad86e9f2dd66fbcecb46dcc22626e9f5a6a6 (diff)
loplugin:flatten in sw/core/layout
Change-Id: I67fd1a269d960174b88c57da4a0588f5d9252660 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99885 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/layout/objectformattertxtfrm.cxx')
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.cxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index c8d64cf4449e..609b5a527ac1 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -462,28 +462,28 @@ void SwObjectFormatterTextFrame::InvalidatePrevObjs( SwAnchoredObject& _rAnchore
// Note: list of objects at anchor frame is sorted by this property.
if ( _rAnchoredObj.GetFrameFormat().GetWrapInfluenceOnObjPos().
// #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
- GetWrapInfluenceOnObjPos( true ) ==
+ GetWrapInfluenceOnObjPos( true ) !=
// #i35017# - constant name has changed
text::WrapInfluenceOnPosition::ONCE_CONCURRENT )
+ return;
+
+ const SwSortedObjs* pObjs = GetAnchorFrame().GetDrawObjs();
+ if ( !pObjs )
+ return;
+
+ // determine start index
+ size_t i = pObjs->ListPosOf( _rAnchoredObj );
+ while (i > 0)
{
- const SwSortedObjs* pObjs = GetAnchorFrame().GetDrawObjs();
- if ( pObjs )
+ --i;
+ SwAnchoredObject* pAnchoredObj = (*pObjs)[i];
+ if ( pAnchoredObj->GetFrameFormat().GetWrapInfluenceOnObjPos().
+ // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
+ GetWrapInfluenceOnObjPos( true ) ==
+ // #i35017# - constant name has changed
+ text::WrapInfluenceOnPosition::ONCE_CONCURRENT )
{
- // determine start index
- size_t i = pObjs->ListPosOf( _rAnchoredObj );
- while (i > 0)
- {
- --i;
- SwAnchoredObject* pAnchoredObj = (*pObjs)[i];
- if ( pAnchoredObj->GetFrameFormat().GetWrapInfluenceOnObjPos().
- // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
- GetWrapInfluenceOnObjPos( true ) ==
- // #i35017# - constant name has changed
- text::WrapInfluenceOnPosition::ONCE_CONCURRENT )
- {
- pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence();
- }
- }
+ pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence();
}
}
}