summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-05-06 13:01:27 +0200
committerBosdonnat Cedric <cedric.bosdonnat@free.fr>2013-05-06 14:52:47 +0000
commitea2603200b46f460f34c930770d69db74a164bde (patch)
tree78f6cf93ca345d4e795ff44099fdcf039f8d8285 /sw/source
parent0618ebfa88b1b3eca11f40c173a53680cd41dedd (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. (cherry picked from commit 4144cd5a851466778004af9de98dbcfb019067bb) Conflicts: sw/qa/extras/ww8export/ww8export.cxx Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a Reviewed-on: https://gerrit.libreoffice.org/3797 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index f002c1ff4226..d83718145192 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1182,7 +1182,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