diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-09-07 19:26:30 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-10-10 17:35:46 +0200 |
| commit | f483fd582b5d5e628865d32342a297909ea0a958 (patch) | |
| tree | 73888138daef99b1a4a4cbff31e6ea97bdd04a89 /writerfilter | |
| parent | ae1f7a09d5f9e54bceff926c6a0ddbf778353e20 (diff) | |
tdf#81345 docx import fix default page break regression
"regression" from 4e653d15eff26aa5283d8ba20611893f4c573f57
If there are new style elements, then don't treat a
default break in columns as a continuous break.
This fixes both round-tripping, and initial import of
columns and headers on this particular document. Since
MS and LO treat sections so differently, it is a balancing
act of what to change.
Reviewed-on: https://gerrit.libreoffice.org/28728
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 3870c0555aa461268a6d056543f4545d562769ce)
Change-Id: I9c79bc1246108da6a5ebbf744acbcfcbb9d33d48
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index cc20bb45d713..180196e1a076 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1201,9 +1201,12 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) } // depending on the break type no page styles should be created - // If the section type is missing, but we have columns, then this should be + // If the section type is missing, but we have columns without new style info, then this should be // handled as a continuous section break. - if(m_nBreakType == static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_SectionMark_continuous) || (m_nBreakType == -1 && m_nColumnCount > 0)) + const bool bTreatAsContinuous = m_nBreakType == -1 + && m_nColumnCount > 0 + && (m_bIsFirstSection || m_sFollowPageStyleName.isEmpty() || (m_sFirstPageStyleName.isEmpty() && m_bTitlePage)); + if(m_nBreakType == static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_SectionMark_continuous) || bTreatAsContinuous) { //todo: insert a section or access the already inserted section uno::Reference< beans::XPropertySet > xSection = |