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

[Justin Luth]

 writerfilter/source/dmapper/PropertyMap.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 541b377a94fb1247dbf4c39b5bcf55deb8e5ef60
Author: Justin Luth <justin_luth at sil.org>
Date:   Thu Mar 16 16:19:04 2017 +0300

    writerfilter: default break type identified as _nextPage
    
    Change-Id: I9247c75819425a97d19c95c48fbaf7a4f8d92c62
    Reviewed-on: https://gerrit.libreoffice.org/35379
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index af073bd5b758..9add77dea8a7 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1178,10 +1178,13 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
         }
     }
 
+    // The default section type is nextPage.
+    if( m_nBreakType == -1 )
+        m_nBreakType = NS_ooxml::LN_Value_ST_SectionMark_nextPage;
+
     // depending on the break type no page styles should be created
-    // If the section type is missing, but we have columns without new style info, then this should be
-    // handled as a continuous section break.
-    const bool bTreatAsContinuous = (m_nBreakType == -1 || m_nBreakType == NS_ooxml::LN_Value_ST_SectionMark_nextPage)
+    // Continuous sections usually create only a section, and not a new page style
+    const bool bTreatAsContinuous = m_nBreakType == NS_ooxml::LN_Value_ST_SectionMark_nextPage
                                     && m_nColumnCount > 0
                                     && !HasHeader(m_bTitlePage) && !HasFooter(m_bTitlePage)
                                     && (m_bIsFirstSection || m_sFollowPageStyleName.isEmpty() || (m_sFirstPageStyleName.isEmpty() && m_bTitlePage));