diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 9bc3957f674e..c19dbf78e3c6 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -724,33 +724,22 @@ SwFlyNotify::~SwFlyNotify() ( !pFly->ISA(SwFlyFreeFrm) || !static_cast<SwFlyFreeFrm*>(pFly)->IsNoMoveOnCheckClip() ) ) { - // #i54138# - suppress restart of the layout process - // on changed frame height. - // Note: It doesn't seem to be necessary and can cause layout loops. - if ( bPosChgd ) - { - // indicate a restart of the layout process - pFly->SetRestartLayoutProcess( true ); - } - else - { - // lock position - pFly->LockPosition(); - - if ( !pFly->ConsiderForTextWrap() ) - { - // indicate that object has to be considered for text wrap - pFly->SetConsiderForTextWrap( true ); - // invalidate 'background' in order to allow its 'background' - // to wrap around it. - pFly->NotifyBackground( pFly->GetPageFrm(), - pFly->GetObjRectWithSpaces(), - PREP_FLY_ARRIVE ); - // invalidate position of anchor frame in order to force - // a re-format of the anchor frame, which also causes a - // re-format of the invalid previous frames of the anchor frame. - pFly->AnchorFrm()->InvalidatePos(); - } + // lock position + pFly->LockPosition(); + + if ( !pFly->ConsiderForTextWrap() ) + { + // indicate that object has to be considered for text wrap + pFly->SetConsiderForTextWrap( true ); + // invalidate 'background' in order to allow its 'background' + // to wrap around it. + pFly->NotifyBackground( pFly->GetPageFrm(), + pFly->GetObjRectWithSpaces(), + PREP_FLY_ARRIVE ); + // invalidate position of anchor frame in order to force + // a re-format of the anchor frame, which also causes a + // re-format of the invalid previous frames of the anchor frame. + pFly->AnchorFrm()->InvalidatePos(); } } } |