diff options
| author | Attila Bakos <bakos.attilakaroly@nisz.hu> | 2020-07-30 10:15:09 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-08-07 11:48:27 +0200 |
| commit | e520a4f988bf0ff81e75e37588182af92fed7631 (patch) | |
| tree | 6f4819414273f13b6aa046cc0d86da47ae8ccc8f /writerfilter | |
| parent | 1cee06c080bceab86ac894f8ae86d4d296b050aa (diff) | |
tdf#112342 DOCX import: fix page break before image-only paragraphs
Picture anchored to an empty paragraphs was moved to the
previous page, because the deferred page wasn't handled here.
Change-Id: I4a694dd443ca8b67c4addbcba3523bffecd21418
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99763
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index cf515ae72669..911f55431cc9 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2287,7 +2287,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { if ( m_pImpl->IsDiscardHeaderFooter() ) break; - + //tdf112342: Break before images as well, if there are page break + if (m_pImpl->isBreakDeferred(BreakType::PAGE_BREAK)) + { + m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) + ->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); + m_pImpl->clearDeferredBreak(PAGE_BREAK); + } writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); if( pProperties ) { |