diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-12-07 21:02:12 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-12-08 08:45:54 +0100 |
| commit | 29993781ac991e85bfbd61f9e076c9d8088cd3ab (patch) | |
| tree | abb21c52c531da73cfab2db4c59bbc3c9834e170 /writerfilter/source | |
| parent | 7896173f7ff017e338721b8079f00634a8879dab (diff) | |
tdf#135217 DOCX import: remove no longer needed top/bottom margin sync
Regression from commit b7ae863efeb082816cc4fe660527a9650d90e186
(tdf#117503 DOCX import: fix out of sync first/later top margin,
2018-05-28), which adjusted the import so that the export can pair
first/follow page styles and write them into a single Word section.
But changing the import for pairing purposes is not a good idea after
all, as it also affects the layout of the imported document.
In the meantime, commit 51534ac2b9747975945acb6a1e1ba5cc6d73f5c2
(tdf#127778 DOCX import: fix unexpected heading on non-first page when
the first page has a heading, 2020-05-11) already fixed the export side,
so this is not even necessary, just remove it.
Change-Id: I94c02517ae1e0804547f81c43bb5890327d32376
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107363
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 40dc5e0da8cc..a29693683555 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1037,15 +1037,6 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage ) //now set the top/bottom margin for the follow page style Insert( PROP_TOP_MARGIN, uno::makeAny( std::max<sal_Int32>(nTopMargin, 0) ) ); Insert( PROP_BOTTOM_MARGIN, uno::makeAny( std::max<sal_Int32>(nBottomMargin, 0) ) ); - - if (bCopyFirstToFollow) - { - if (HasHeader(/*bFirstPage=*/true)) - m_aFollowPageStyle->setPropertyValue("TopMargin", getProperty(PROP_TOP_MARGIN)->second); - if (HasFooter(/*bFirstPage=*/true)) - m_aFollowPageStyle->setPropertyValue("BottomMargin", - getProperty(PROP_BOTTOM_MARGIN)->second); - } } static uno::Reference< beans::XPropertySet > lcl_GetRangeProperties( bool bIsFirstSection, |