diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-10-01 17:55:58 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-10-02 01:06:46 +0200 |
commit | 489eef894e7034873ad262f9dfca554022db1b09 (patch) | |
tree | 878d6281511e46c50a7d09d3be46bc5ccc0f9677 /ridljar/test/com | |
parent | 727ca36e83868acbe40aaa239cefc69659b9bc39 (diff) |
tdf#124601 sw FollowTextFlow: fix vert pos of objects outside the current cell
There were two problems here:
1) CalcHeightWithFlys() considered all follow-text-flow objects when
determining the cell size, while wrap-through objects should never
influence the layout of text (i.e. when they conflict, the second should
have priority).
2) Once the cell had correct height, the oscillaction described in the
SwFlyFreeFrame::CheckClip() comment started. Such a position update was
already disabled for headers, but footers have exactly the same problem.
In the case of the bugdoc, we jumped between 14618 and 14744 twips, till
finally layout loop control kicked in.
[ FollowTextFlow is meant to be same behavior as Word's layoutInCell
shape property, so this is expected to improve rendering of existing
documents. It's not likely that any user would opt in for FollowTextFlow
to have the old close-but-not-exactly-matching behavior. ]
Change-Id: I6b3b672fc82c6c67dbbdd35c349613fe4cda610d
Reviewed-on: https://gerrit.libreoffice.org/79980
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'ridljar/test/com')
0 files changed, 0 insertions, 0 deletions