path: root/writerfilter
diff options
authorMiklos Vajna <>2020-05-11 21:08:35 +0200
committerMiklos Vajna <>2020-05-12 09:02:43 +0200
commit51534ac2b9747975945acb6a1e1ba5cc6d73f5c2 (patch)
treeb39fb0577bac479321027ae08640c11f3d2d0bc2 /writerfilter
parent23d9966751566028c50ca95ca203d20f36c64f30 (diff)
tdf#127778 DOCX import: fix unexpected heading on non-first page ...
... when the first page has a heading Regression from commit 17e51f427b3f0cec74ac8e0a1b3f51189006ae6f (DOCX import: first page header should always set default headers as well, 2014-11-21), the problem is around how to split a first + follow page style on import, and then do the opposite on export. This is described using a single section in OOXML, but Writer has 2 page styles for this (unlike in case of the DOC filter). This means the header margin has to be taken from one of these page styles. The above commit tweaked the import, so the follow page style has the wanted header margin, but this leads to incorrect layout. Fix the problem by tweaking the export instead: it has random access to the doc model, so it can take the header margin from the first page style if needed, and then the import side can be reverted, leading to correct layout. Also remove some leftover debug code in test/, which was added in commit 5352d45dd4a04f8f02cf7f6ad4169126d3b3586a (convert AnimationImport to fast-parser APIs, 2020-02-18). Change-Id: I4bbf7271f3a437e8432399bd1e32e9d24190a501 Reviewed-on: Tested-by: Jenkins Reviewed-by: Miklos Vajna <>
Diffstat (limited to 'writerfilter')
1 files changed, 0 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 44127d0d7f86..9d268919f41b 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -948,15 +948,6 @@ void SectionPropertyMap::CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Imp
void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage )
bool bCopyFirstToFollow = bFirstPage && m_bTitlePage &&;
- if (bCopyFirstToFollow)
- {
- // This is a first page and has a follow style, then enable the
- // header/footer there as well to be consistent.
- if (HasHeader(/*bFirstPage=*/true))
- m_aFollowPageStyle->setPropertyValue("HeaderIsOn", uno::makeAny(true));
- if (HasFooter(/*bFirstPage=*/true))
- m_aFollowPageStyle->setPropertyValue("FooterIsOn", uno::makeAny(true));
- }
sal_Int32 nTopMargin = m_nTopMargin;
sal_Int32 nHeaderTop = m_nHeaderTop;