diff options
| author | Luke Deller <luke@deller.id.au> | 2018-05-31 23:16:26 +1000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-06 09:42:41 +0200 |
| commit | 6c68e52532d45c97a83b2396bd40c98ade9b5bb4 (patch) | |
| tree | 70caddf710e4b7a927483b538d0786c4aa33f194 /sw/source/filter/ww8/ww8par6.cxx | |
| parent | 9739c37d8ad7c6fca269709674a6975fa7ebd191 (diff) | |
Fix top margin in DOC import for tdf#117885
When calculating the height of the top/bottom margin, we take into
account whether the DOC section has a header/footer enabled.
If the DOC section contains only a first-page header/footer, and the
display of first-page header/footer in this section is not enabled,
then we must consider the section to have no header/footer.
(Also add a test case using the doc supplied by the reporter in
tdf#117885)
Change-Id: I8040298a2953b3f3fe8dd80bfd62db2304db938e
Reviewed-on: https://gerrit.libreoffice.org/55135
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8/ww8par6.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 621a7060b4e7..227fe8937a0f 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -496,8 +496,17 @@ void wwSectionManager::GetPageULData(const wwSection &rSection, nWWUp += rSection.maSep.dzaGutter; } - rData.bHasHeader = (rSection.maSep.grpfIhdt & - (WW8_HEADER_EVEN | WW8_HEADER_ODD | WW8_HEADER_FIRST)) != 0; + /* Check whether this section has headers / footers */ + sal_uInt16 nHeaderMask = WW8_HEADER_EVEN | WW8_HEADER_ODD; + sal_uInt16 nFooterMask = WW8_HEADER_EVEN | WW8_HEADER_ODD; + /* Ignore the presence of a first-page header/footer unless it is enabled */ + if( rSection.HasTitlePage() ) + { + nHeaderMask |= WW8_HEADER_FIRST; + nFooterMask |= WW8_FOOTER_FIRST; + } + rData.bHasHeader = (rSection.maSep.grpfIhdt & nHeaderMask) != 0; + rData.bHasFooter = (rSection.maSep.grpfIhdt & nFooterMask) != 0; if( rData.bHasHeader ) { @@ -518,9 +527,6 @@ void wwSectionManager::GetPageULData(const wwSection &rSection, else // no header -> just use Up as-is rData.nSwUp = std::abs(nWWUp); - rData.bHasFooter = (rSection.maSep.grpfIhdt & - (WW8_FOOTER_EVEN | WW8_FOOTER_ODD | WW8_FOOTER_FIRST)) != 0; - if( rData.bHasFooter ) { rData.nSwLo = nWWFBot; // footer -> convert |