diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-14 12:34:23 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-08-19 17:57:15 +0200 |
| commit | 4a1c82de77f28a107198b8d8da3cf840d541360a (patch) | |
| tree | bc57baef6624443bf4966ce2354b160e861325a1 /writerfilter/source | |
| parent | 2e7a33658983b6863d3847daca0265e43fbe18ba (diff) | |
DOCX import: fix FooterBodyDistance for first pages
The root cause was that code in
SectionPropertyMap::PrepareHeaderFooterProperties() saved member
variables on the stack, modified them, then restored them at the end of
the method, but forgot to restore m_nBottomMargin there.
The result of this was that First Page's FooterBodyDistance got set to
zero, which is not the same as Default Style's FooterBodyDistance (150),
so on export sw::util::IsPlausableSingleWordSection() returned false,
which turned the page break into a section break.
Change-Id: I1afa2603de1313ae1e2aaefd4b7c771fce27e21e
(cherry picked from commit 8cf681c5049970573020d8b808c990441b9cf828)
Signed-off-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 647c91505a6b..0b47cad74416 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -868,6 +868,7 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage ) // Restore original top margin, so we don't end up with a smaller margin in case we have to produce two page styles from one Word section. m_nTopMargin = nTopMargin; m_nHeaderTop = nHeaderTop; + m_nBottomMargin = nBottomMargin; m_nHeaderBottom = nHeaderBottom; } |