diff options
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 12 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 28 |
2 files changed, 28 insertions, 12 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx index 9e81f4552670..f96451dda24d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx @@ -459,6 +459,18 @@ DECLARE_OOXMLEXPORT_TEST(testContSectBreakHeaderFooter, "cont-sect-break-header- // - Expected: Header, section 2 // - Actual : First page header, section 2 // i.e. both the header and the footer on page 3 was wrong. + + // Additional problem: top margin on page 3 was wrong. + if (mbExported) + { + xmlDocPtr pXml = parseExport("word/document.xml"); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 2200 + // - Actual : 2574 + // i.e. the top margin on page 3 was too large and now matches the value from the input + // document. + assertXPath(pXml, "/w:document/w:body/w:sectPr/w:pgMar", "top", "2200"); + } } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 2908f78fef0e..bfe6483b7f41 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1523,11 +1523,11 @@ void WW8Export::WriteHeadersFooters( sal_uInt8 nHeadFootFlags, namespace { /** - * Find a node near the section start that has a page break, it may have a follow header/footer for - * us. + * Determines if the continuous section break we start should use page style properties (header, + * footer, margins) from the next page style of the previous section. */ -bool WriteNextStyleHeaderFooter(sal_uInt8 nBreakCode, sal_uInt8 nHeadFootFlags, - const SwPageDesc* pPd, const WW8_SepInfo& rSepInfo) +bool UsePrevSectionNextStyle(sal_uInt8 nBreakCode, const SwPageDesc* pPd, + const WW8_SepInfo& rSepInfo) { if (nBreakCode != 0) { @@ -1535,12 +1535,6 @@ bool WriteNextStyleHeaderFooter(sal_uInt8 nBreakCode, sal_uInt8 nHeadFootFlags, return false; } - if (nHeadFootFlags != 0) - { - // Would write some header/footer anyway. - return false; - } - if (!pPd->GetFollow()) { // Page style has no follow style. @@ -1624,6 +1618,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt bool bOutPgDscSet = true, bLeftRightPgChain = false, bOutputStyleItemSet = false; bool bEnsureHeaderFooterWritten = rSepInfo.pSectionFormat && rSepInfo.bIsFirstParagraph; const SwFrameFormat* pPdFormat = &pPd->GetMaster(); + bool bUsePrevSectionNextStyle = false; if ( rSepInfo.pSectionFormat ) { // if pSectionFormat is set, then there is a SectionNode @@ -1649,6 +1644,15 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt // produce Itemset, which inherits PgDesk-Attr-Set: // as child also the parent is searched if 'deep'-OutputItemSet const SfxItemSet* pPdSet = &pPdFormat->GetAttrSet(); + + bUsePrevSectionNextStyle = GetExportFormat() == ExportFormat::DOCX + && UsePrevSectionNextStyle(nBreakCode, pPd, rSepInfo); + if (bUsePrevSectionNextStyle) + { + // Take page margins from the previous section's next style. + pPdSet = &pPd->GetFollow()->GetMaster().GetAttrSet(); + } + SfxItemSet aSet( *pPdSet->GetPool(), pPdSet->GetRanges() ); aSet.SetParent( pPdSet ); @@ -1841,9 +1845,9 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt const SwTextNode *pOldPageRoot = GetHdFtPageRoot(); SetHdFtPageRoot( rSepInfo.pPDNd ? rSepInfo.pPDNd->GetTextNode() : nullptr ); - if (GetExportFormat() == ExportFormat::DOCX - && WriteNextStyleHeaderFooter(nBreakCode, nHeadFootFlags, pPd, rSepInfo)) + if (bUsePrevSectionNextStyle && nHeadFootFlags == 0) { + // Take headers/footers from the previous section's next style. pPdFormat = &pPd->GetFollow()->GetMaster(); MSWordSections::SetHeaderFlag(nHeadFootFlags, *pPdFormat, WW8_HEADER_ODD); MSWordSections::SetFooterFlag(nHeadFootFlags, *pPdFormat, WW8_FOOTER_ODD); |