diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-11-26 12:30:03 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2016-11-29 19:09:50 +0000 |
| commit | d1c06ed189e9af7871961f72acae2dfd938d71d5 (patch) | |
| tree | 5623ba4a56caacacee412dd3f4d7ce01a04fa40d /writerfilter | |
| parent | d5364fe73702b1097e546ea35dd493723e7333ed (diff) | |
tdf#103975 docx import: don't remove sectPr with BreakItem
If an empty sectPr paragraph contains Page/Column break
information, do not discard it.
Change-Id: If817debccb924eb9cf0ffdc374c960d25908370f
Reviewed-on: https://gerrit.libreoffice.org/31227
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 7b250d56981f78e77454a2a3fd670731b2358e75)
Reviewed-on: https://gerrit.libreoffice.org/31233
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 18c991b7ac52..26168b8c191f 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3267,6 +3267,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) // no runs, we should not create a paragraph for it in Writer, unless that would remove the whole section. bool bRemove = !m_pImpl->GetParaChanged() && m_pImpl->GetParaSectpr() && !bSingleParagraph + && !( pContext && pContext->isSet(PROP_BREAK_TYPE) ) && !m_pImpl->GetIsDummyParaAddedForTableInSection() && !m_pImpl->GetIsLastParagraphFramed(); PropertyMapPtr xContext = bRemove ? m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) : PropertyMapPtr(); |