summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-09-04 17:19:47 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-09-04 17:34:45 +0200
commit3f2774c771fc54757364ed50fab9b4753d067371 (patch)
tree43fc1abdd08a04eabbff80a795a164f505c488a3 /sw/source
parent3a021c00d9b27e6bcafbfaf8bf7b36cdd40768e2 (diff)
fdo#68787 DOCX export: handle zero width footnote separator
Change-Id: Ieb1d8d1f8609558b4af06630b603a51da3e665f4
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx12
1 files changed, 11 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 342bd750215e..7f08f583b62b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4340,7 +4340,17 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes )
FSEND );
m_pSerializer->startElementNS( XML_w, XML_p, FSEND );
m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
- m_pSerializer->singleElementNS( XML_w, XML_separator, FSEND );
+
+ bool bSeparator = true;
+ if (bFootnotes)
+ {
+ const SwPageFtnInfo& rFtnInfo = m_rExport.pDoc->GetPageDesc(0).GetFtnInfo();
+ // Request a separator only in case the width is larger than zero.
+ bSeparator = double(rFtnInfo.GetWidth()) > 0;
+ }
+
+ if (bSeparator)
+ m_pSerializer->singleElementNS( XML_w, XML_separator, FSEND );
m_pSerializer->endElementNS( XML_w, XML_r );
m_pSerializer->endElementNS( XML_w, XML_p );
m_pSerializer->endElementNS( XML_w, nItem );