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 /sw/source/filter/ww8 | |
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
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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, 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 |