diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-06 14:07:45 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-08-24 11:28:58 +0200 |
commit | ed7c4c96a999bb2ef5eeced7588da5d3845d2b7d (patch) | |
tree | 9cd384d6f119c33f957aa3fed0594b98a652214b /sanitize-ubsan-blacklist | |
parent | ba4c9af309e97338f4e2929d6dba12c92c1a4bfc (diff) |
i#61225 sw: fix layout loop with growable single-column sections
Commit 6ade80cf142664e78954c7544534e9436ceb90c7 (tdf#108524 sw: allow
move of frame inside section without columns, 2017-06-16) relaxed
lcl_IsInSectionDirectly() used in SwFrame::IsMoveable() to allow move
for all section frame contents if it has a single column. That looked
safe, as the multiple column case was already allowed.
There is one situation where this still causes a problem: when the
section has a single column and the section frame is growable -- as in
that case we should grow the section frame, not move the contents.
So go back to unconditionally allowing multi-column section contents and
allow single-column section contents only in case the section frame is
now growable.
With this, ooo61225-1.sxw from the crashtesting corpus can be opened
again without a layout loop.
Reviewed-on: https://gerrit.libreoffice.org/39653
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 972fbddf80510f7daaf2128dbfda01c0e7535020)
Conflicts:
sw/qa/extras/odfimport/odfimport.cxx
Change-Id: Ib2d3702a33da8e62b9bbf468d558ae16db8aa94b
Diffstat (limited to 'sanitize-ubsan-blacklist')
0 files changed, 0 insertions, 0 deletions