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.

Change-Id: Ib2d3702a33da8e62b9bbf468d558ae16db8aa94b
Reviewed-on: https://gerrit.libreoffice.org/39653
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 74942256bef4..4a3d3722edd8 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1256,10 +1256,15 @@ void SwFrame::InvalidateNextPrtArea()
 ///     but not if it sits in a table which itself sits in a section.
 static bool lcl_IsInSectionDirectly( const SwFrame *pUp )
 {
+    bool bSeenColumn = false;
+
     while( pUp )
     {
-        if( pUp->IsSctFrame() )
-            return true;
+        if( pUp->IsColumnFrame() )
+            bSeenColumn = true;
+        else if( pUp->IsSctFrame() )
+            // Allow move of frame in case our only column is not growable.
+            return bSeenColumn || !static_cast<const SwSectionFrame*>(pUp)->Growable();
         else if( pUp->IsTabFrame() )
             return false;
         pUp = pUp->GetUpper();