diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-13 15:54:23 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-08-23 11:46:46 +0200 |
| commit | 08e39d3c72f6e5eac041caac8b2219247c35b6b8 (patch) | |
| tree | 7b6459df77a8341d90cb0454f652afd6dd09ce93 /sw | |
| parent | 92310c27d6b23aa04d218a585d5010db6afe088c (diff) | |
tdf#108524 sw: allow frames in follow sect-in-tables in SwFlowFrame::MoveBwd()
The intention is to filter out text frames directly inside tables; since
tables in general reflow by moving all of the content to the first page,
then moving not fitting content to the next pages. Section frames are
different, there we explicitly move content backwards, similarly to page
body frames.
Teach SwFlowFrame::MoveFwd() that a text frame inside a section-in-table
is the section situation, not the table situation, since what matters
here is the direct parent. To be on the safe side allow this for follow
section frames only.
This is necessary, but not enough to address the sub-problem described
in comment 12 of the bug. At least SwFrame::GetPrevSctLeaf() is invoked
to consider a precede section frame, though.
Change-Id: Ic88602cffefbbc81ecc90e3880be2a098f60fb04
(cherry picked from commit 4908d6d6742e2f0700ea4ccd9d636d91ea281046)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index c48029a3244f..e6915db4c908 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2010,7 +2010,10 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat ) { return false; } - if ( pUpperFrame->IsColumnFrame() && pUpperFrame->IsInSct() ) + // If the text frame is a follow-section-in-table, that can move + // backward as well. + bool bIsFollowSection = pUpperFrame->IsSctFrame() && static_cast<const SwSectionFrame*>(pUpperFrame)->GetPrecede(); + if ( ( pUpperFrame->IsColumnFrame() && pUpperFrame->IsInSct() ) || bIsFollowSection ) { break; } |