mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for Footer is missing if fisrt page different header/footer is set

Browse Source 
Reviewed on:
	https://gerrit.libreoffice.org/7589

Change-Id: I2a2f2abc0dcf5542b7b950f9a232d7155a055fdd
This commit is contained in:
Rohit Deshmukh
2014-01-22 18:03:21 +05:30
committed by Miklos Vajna
parent d2d5864462
commit dcea8ba3b4
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/ooxmlexport/data/testTitlePage.docx Normal file
View File

Binary file not shown.

7
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
View File

@@ -2637,6 +2637,13 @@ DECLARE_OOXMLEXPORT_TEST(testTOCFlag_u,"testTOCFlag_u.docx")
OUString contents = OUString::createFromAscii((const char*)((pXmlNode->children[0]).content)); OUString contents = OUString::createFromAscii((const char*)((pXmlNode->children[0]).content));
CPPUNIT_ASSERT(contents.match(" TOC \\z \\o \"1-9\" \\u \\h")); CPPUNIT_ASSERT(contents.match(" TOC \\z \\o \"1-9\" \\u \\h"));
} }
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);
}
DECLARE_OOXMLEXPORT_TEST(testTableRowDataDisplayedTwice,"table-row-data-displayed-twice.docx") DECLARE_OOXMLEXPORT_TEST(testTableRowDataDisplayedTwice,"table-row-data-displayed-twice.docx")
{ {

2
sw/source/filter/ww8/wrtw8sty.cxx
View File

@@ -1747,7 +1747,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
{ {
const SwPageDesc *pFollow = pPd->GetFollow(); const SwPageDesc *pFollow = pPd->GetFollow();
const SwFrmFmt& rFollowFmt = pFollow->GetMaster(); const SwFrmFmt& rFollowFmt = pFollow->GetMaster();
if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt, rFollowFmt ) ) if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt, rFollowFmt ) || titlePage )
{ {
if (rSepInfo.pPDNd) if (rSepInfo.pPDNd)
pPdFirstPgFmt = pPd->GetPageFmtOfNode( *rSepInfo.pPDNd ); pPdFirstPgFmt = pPd->GetPageFmtOfNode( *rSepInfo.pPDNd );