diff options
| author | Rohit Deshmukh <rohit.deshmukh@synerzip.com> | 2014-01-22 18:03:21 +0530 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-07-27 16:36:45 +0200 |
| commit | f71749ac15d7e0851c73952a5d9b7b727d1cd262 (patch) | |
| tree | 5fb72376b7bbf40b4255e822bc19900e8c1dd0cf | |
| parent | aaa18a45c6f5e4f2b5fb1ee2deee510ea3353053 (diff) | |
Fix for Footer is missing if fisrt page different header/footer is set
Reviewed on:
https://gerrit.libreoffice.org/7589
Signed-off-by: Luboš Luňák <l.lunak@collabora.com>
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I2a2f2abc0dcf5542b7b950f9a232d7155a055fdd
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/testTitlePage.docx | bin | 0 -> 16479 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/testTitlePage.docx b/sw/qa/extras/ooxmlexport/data/testTitlePage.docx Binary files differnew file mode 100644 index 000000000000..72bfdf81f886 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/testTitlePage.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 460d49707e0d..ea37815b42a8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2088,6 +2088,14 @@ DECLARE_OOXMLEXPORT_TEST(testBnc884615, "bnc884615.docx") CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(getShape(1), "Opaque"))); } +DECLARE_OOXMLEXPORT_TEST(testTestTitlePage, "testTitlePage.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + assertXPathChildren(pXmlDoc, "/w:document/w:body/w:sectPr/w:titlePg", 0); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 2675cc56c385..a4edf4b86a07 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1748,7 +1748,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt { const SwPageDesc *pFollow = pPd->GetFollow(); const SwFrmFmt& rFollowFmt = pFollow->GetMaster(); - if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt, rFollowFmt ) ) + if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt, rFollowFmt ) || titlePage ) { if (rSepInfo.pPDNd) pPdFirstPgFmt = pPd->GetPageFmtOfNode( *rSepInfo.pPDNd ); |