diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-05-06 13:01:27 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-06 13:02:26 +0200 |
commit | 4144cd5a851466778004af9de98dbcfb019067bb (patch) | |
tree | 5378119856dd4b0a6b955100ee03d15a1c27a146 | |
parent | e50ef531021ea2322ebaf5109f6fe758e65d27b0 (diff) |
fdo#42144 WW8 export: avoid writing pointless empty footers
Regression from 1348288905ffa75d3634eee4392ba4660d28cdb9 (mismerge, I
guess), when header was enabled, actually empty footer was exported,
even in case footer was disabled.
Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a
-rw-r--r-- | sw/qa/extras/ww8export/data/fdo42144.odt | bin | 0 -> 9425 bytes | |||
-rw-r--r-- | sw/qa/extras/ww8export/ww8export.cxx | 9 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/sw/qa/extras/ww8export/data/fdo42144.odt b/sw/qa/extras/ww8export/data/fdo42144.odt new file mode 100644 index 000000000000..be9490079e72 --- /dev/null +++ b/sw/qa/extras/ww8export/data/fdo42144.odt | |||
Binary files differ | |||
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 65fcfe2e0f95..0c2f7698b3c5 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx | |||
@@ -25,6 +25,7 @@ public: | |||
25 | void testZoom(); | 25 | void testZoom(); |
26 | void test56513(); | 26 | void test56513(); |
27 | void testNewPageStylesTable(); | 27 | void testNewPageStylesTable(); |
28 | void testFdo42144(); | ||
28 | 29 | ||
29 | CPPUNIT_TEST_SUITE(Test); | 30 | CPPUNIT_TEST_SUITE(Test); |
30 | #if !defined(MACOSX) && !defined(WNT) | 31 | #if !defined(MACOSX) && !defined(WNT) |
@@ -46,6 +47,7 @@ void Test::run() | |||
46 | {"zoom.doc", &Test::testZoom}, | 47 | {"zoom.doc", &Test::testZoom}, |
47 | {"fdo56513.doc", &Test::test56513}, | 48 | {"fdo56513.doc", &Test::test56513}, |
48 | {"new-page-styles.doc", &Test::testNewPageStylesTable}, | 49 | {"new-page-styles.doc", &Test::testNewPageStylesTable}, |
50 | {"fdo42144.odt", &Test::testFdo42144}, | ||
49 | }; | 51 | }; |
50 | header(); | 52 | header(); |
51 | for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i) | 53 | for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i) |
@@ -140,6 +142,13 @@ void Test::testNewPageStylesTable() | |||
140 | CPPUNIT_ASSERT_EQUAL(OUString("Sigma Space Performance Goals: Next Year (Page 3)*******"), parseDump("/root/page[3]/header/txt/text()")); | 142 | CPPUNIT_ASSERT_EQUAL(OUString("Sigma Space Performance Goals: Next Year (Page 3)*******"), parseDump("/root/page[3]/header/txt/text()")); |
141 | } | 143 | } |
142 | 144 | ||
145 | void Test::testFdo42144() | ||
146 | { | ||
147 | // Footer wasn't disabled -- instead empty footer was exported. | ||
148 | uno::Reference<beans::XPropertySet> xStyle(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY); | ||
149 | CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(xStyle, "FooterIsOn"))); | ||
150 | } | ||
151 | |||
143 | CPPUNIT_TEST_SUITE_REGISTRATION(Test); | 152 | CPPUNIT_TEST_SUITE_REGISTRATION(Test); |
144 | 153 | ||
145 | CPPUNIT_PLUGIN_IMPLEMENT(); | 154 | CPPUNIT_PLUGIN_IMPLEMENT(); |
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 17fb01c50706..83970930809a 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx | |||
@@ -1183,7 +1183,7 @@ void WW8_WrPlcSepx::OutHeaderFooter( WW8Export& rWrt, bool bHeader, | |||
1183 | else if ( rWrt.bWrtWW8 ) | 1183 | else if ( rWrt.bWrtWW8 ) |
1184 | { | 1184 | { |
1185 | pTxtPos->Append( rCpPos ); | 1185 | pTxtPos->Append( rCpPos ); |
1186 | if (rWrt.bHasHdr && nBreakCode!=0) | 1186 | if ((bHeader? rWrt.bHasHdr : rWrt.bHasFtr) && nBreakCode!=0) |
1187 | { | 1187 | { |
1188 | rWrt.WriteStringAsPara( aEmptyStr ); // Empty paragraph for empty header/footer | 1188 | rWrt.WriteStringAsPara( aEmptyStr ); // Empty paragraph for empty header/footer |
1189 | rWrt.WriteStringAsPara( aEmptyStr ); // a CR that WW8 needs for end of the stream | 1189 | rWrt.WriteStringAsPara( aEmptyStr ); // a CR that WW8 needs for end of the stream |