summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2019-10-16 10:16:46 +0200
committerLászló Németh <nemeth@numbertext.org>2019-10-16 11:44:09 +0200
commit350972a8bffc1a74b531e0336954bf54b1356025 (patch)
tree4cfc8adf3d8f01e0428b3b3524aad2fad0fd29c7 /writerfilter
parentccdb68fd5893f106609eacf71023d2269a682085 (diff)
tdf#128156 DOCX import: fix losing redline at page break
w:framePr of page header doesn't mean real frame conversion, so don't store and lose redlines after it. Regression from commit e8bae67b3dbcc90ace8264b6b1aefaf0ce459aba "tdf#125894: DOCX: import tracked changes in frames". Change-Id: I46cd153cccef4824deca1f64341f2ea6672cdc42 Reviewed-on: https://gerrit.libreoffice.org/80871 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index c8c4ce04f850..60cd9202b813 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1999,7 +1999,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
if (pParaContext)
pParaContext->SetFrameMode();
- m_pImpl->m_bIsActualParagraphFramed = true;
+ if (!IsInHeaderFooter())
+ m_pImpl->m_bIsActualParagraphFramed = true;
}
else
{