Kaydet (Commit) 4144cd5a authored tarafından Miklos Vajna's avatar Miklos Vajna

fdo#42144 WW8 export: avoid writing pointless empty footers

Regression from 13482889 (mismerge, I
guess), when header was enabled, actually empty footer was exported,
even in case footer was disabled.

Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a
üst e50ef531
......@@ -25,6 +25,7 @@ public:
void testZoom();
void test56513();
void testNewPageStylesTable();
void testFdo42144();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
......@@ -46,6 +47,7 @@ void Test::run()
{"zoom.doc", &Test::testZoom},
{"fdo56513.doc", &Test::test56513},
{"new-page-styles.doc", &Test::testNewPageStylesTable},
{"fdo42144.odt", &Test::testFdo42144},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
......@@ -140,6 +142,13 @@ void Test::testNewPageStylesTable()
CPPUNIT_ASSERT_EQUAL(OUString("Sigma Space Performance Goals: Next Year (Page 3)*******"), parseDump("/root/page[3]/header/txt/text()"));
}
void Test::testFdo42144()
{
// Footer wasn't disabled -- instead empty footer was exported.
uno::Reference<beans::XPropertySet> xStyle(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(xStyle, "FooterIsOn")));
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
......
......@@ -1183,7 +1183,7 @@ void WW8_WrPlcSepx::OutHeaderFooter( WW8Export& rWrt, bool bHeader,
else if ( rWrt.bWrtWW8 )
{
pTxtPos->Append( rCpPos );
if (rWrt.bHasHdr && nBreakCode!=0)
if ((bHeader? rWrt.bHasHdr : rWrt.bHasFtr) && nBreakCode!=0)
{
rWrt.WriteStringAsPara( aEmptyStr ); // Empty paragraph for empty header/footer
rWrt.WriteStringAsPara( aEmptyStr ); // a CR that WW8 needs for end of the stream
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment