diff options
| author | Justin Luth <justin_luth@sil.org> | 2017-03-16 16:19:04 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-05-17 10:53:33 +0200 |
| commit | 8c9002a9509fb161ebebccc0f358a0dc5b6a8a12 (patch) | |
| tree | cf6b1f6c9dbe8a2d5096d313636a538c9c0270a3 /writerfilter | |
| parent | 1299dc274864038bd2961b685430e522456c0f1a (diff) | |
writerfilter: default break type identified as _nextPage
Change-Id: I9247c75819425a97d19c95c48fbaf7a4f8d92c62
Reviewed-on: https://gerrit.libreoffice.org/35379
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 541b377a94fb1247dbf4c39b5bcf55deb8e5ef60)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 9272079687c0..556c9be7aff2 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1192,10 +1192,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)); |