[PATCH libreoffice-4-0] minimal change to fix fdo#57908 for backport

[Luke Deller (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2137

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/2137/1

minimal change to fix fdo#57908 for backport

wwSectionManager::GetPageULData adjusts margins and header/footer
heights according to whether there is a header/footer or not.
It could be confused into thinking there was no header/footer when
indeed there was, in the case where a first page header/footer was
inherited from a previous section which contained but did not actually
show that header.

Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4
---
M sw/source/filter/ww8/ww8par6.cxx
1 file changed, 7 insertions(+), 3 deletions(-)



diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 761a68a..691b8f7 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1115,10 +1115,14 @@
         aNewSection.maSep.grpfIhdt = ReadBSprm(pSep, eVer <= ww::eWW2 ? 128 : 153, 0);
     else if (mrReader.pHdFt)
     {
-        aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD;
+        aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD
+            | WW8_HEADER_FIRST | WW8_FOOTER_FIRST;
 
-        if (aNewSection.HasTitlePage())
-            aNewSection.maSep.grpfIhdt |= WW8_HEADER_FIRST | WW8_FOOTER_FIRST;
+        // It is possible for a first page header to be provided
+        // for this section, but not actually shown in this section.  In this
+        // case (aNewSection.maSep.grpfIhdt & WW8_HEADER_FIRST) will be nonzero
+        // but aNewSection.HasTitlePage() will be false.
+        // Likewise for first page footer.
 
         if (mrReader.pWDop->fFacingPages)
             aNewSection.maSep.grpfIhdt |= WW8_HEADER_EVEN | WW8_FOOTER_EVEN;

-- 
To view, visit https://gerrit.libreoffice.org/2137
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Luke Deller <luke at deller.id.au>