[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/core/layout/tabfrm.cxx |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 336ec28195da1917c22494a24dbaf10b846d3141
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jun 15 12:18:31 2017 +0200

    tdf#108524 sw: try to split rows that contain 1-col sections
    
    We used to not even attempt to split a row that contains sections. Relax
    this condition and try to split the row in case the table itself is not
    in a section (to avoid recursion) and the section has no columns.
    
    This is needed, but not enough to split the section in the bugdoc.
    
    Change-Id: I6ad0d6eb18611f108ae29e4feea7101ffe552c48
    Reviewed-on: https://gerrit.libreoffice.org/38824
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index be7d97b0c35d..680f228899d8 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -915,7 +915,22 @@ static bool lcl_FindSectionsInRow( const SwRowFrame& rRow )
             else
             {
                 // #i26945# - search only for sections
-                bRet = pTmpFrame->IsSctFrame();
+                if (pTmpFrame->IsSctFrame())
+                {
+                    bRet = true;
+
+                    if (!rRow.IsInSct())
+                    {
+                        // This row is not in a section.
+                        if (const SwFrame* pSectionLower = pTmpFrame->GetLower())
+                        {
+                            if (!pSectionLower->IsColumnFrame())
+                                // Section has a single column only, try to
+                                // split that.
+                                bRet = false;
+                        }
+                    }
+                }
             }
 
             if ( bRet )