diff options
author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-03-22 14:52:37 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-03-22 15:10:51 +0100 |
commit | 8a233f17ae589b33e3b54ef9ebb1fcff41ef6cd7 (patch) | |
tree | 29c5ac065ba34fbd5ce5efff53a97d40300c9101 /sw/source/core/layout/objectformattertxtfrm.cxx | |
parent | 2a4e77a6f94d35919237b9db9de184e70943fc13 (diff) |
n#750258: removed strange non-wrapping condition
In the bug file, some text wrapping was badly computed when showing the
document (but not at the first rendering) due to that weird NotToWrap
mecahnism in SwLayouter. Checked the original issue i#40155 that
removing this does hurt.
Diffstat (limited to 'sw/source/core/layout/objectformattertxtfrm.cxx')
-rw-r--r-- | sw/source/core/layout/objectformattertxtfrm.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 3ceb54abb5fc..c1d8eb844b91 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -296,9 +296,6 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, mrAnchorTxtFrm.GetFollow() && mrAnchorTxtFrm.GetFollow()->GetOfst() == 0 ) { - SwLayouter::InsertFrmNotToWrap( - *(mrAnchorTxtFrm.FindPageFrm()->GetFmt()->GetDoc()), - mrAnchorTxtFrm ); SwLayouter::RemoveMovedFwdFrm( *(mrAnchorTxtFrm.FindPageFrm()->GetFmt()->GetDoc()), mrAnchorTxtFrm ); @@ -467,9 +464,6 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs() mrAnchorTxtFrm.GetFollow() && mrAnchorTxtFrm.GetFollow()->GetOfst() == 0 ) { - SwLayouter::InsertFrmNotToWrap( - *(mrAnchorTxtFrm.FindPageFrm()->GetFmt()->GetDoc()), - mrAnchorTxtFrm ); SwLayouter::RemoveMovedFwdFrm( *(mrAnchorTxtFrm.FindPageFrm()->GetFmt()->GetDoc()), mrAnchorTxtFrm ); |