diff options
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/fdo79062.docx | bin | 0 -> 17422 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxexport.hxx | 6 |
4 files changed, 17 insertions, 7 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79062.docx b/sw/qa/extras/ooxmlexport/data/fdo79062.docx Binary files differnew file mode 100644 index 000000000000..181ea7283610 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/fdo79062.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 9a1948568dbb..4d02d314ef72 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1670,6 +1670,19 @@ DECLARE_OOXMLEXPORT_TEST(testFdo70812, "fdo70812.docx") getParagraph(1, "Sample pages document."); } +DECLARE_OOXMLEXPORT_TEST(testFDO79062, "fdo79062.docx") +{ + xmlDocPtr pXmlFootNotes = parseExport("word/footnotes.xml"); + if (!pXmlFootNotes) + return; + assertXPath(pXmlFootNotes, "/w:footnotes", "Ignorable", "w14 wp14"); + + xmlDocPtr pXmlEndNotes = parseExport("word/endnotes.xml"); + if (!pXmlEndNotes) + return; + assertXPath(pXmlEndNotes, "/w:endnotes", "Ignorable", "w14 wp14"); +} + DECLARE_OOXMLEXPORT_TEST(testPgMargin, "testPgMargin.docx") { xmlDocPtr pXmlDoc = parseExport(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 5cfda6e80873..a8b5fcd393b8 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5970,10 +5970,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes ) sal_Int32 nBody = bFootnotes? XML_footnotes: XML_endnotes; sal_Int32 nItem = bFootnotes? XML_footnote: XML_endnote; - m_pSerializer->startElementNS( XML_w, nBody, - FSNS( XML_xmlns, XML_w ), "http://schemas.openxmlformats.org/wordprocessingml/2006/main", - FSNS( XML_xmlns, XML_r ), "http://schemas.openxmlformats.org/officeDocument/2006/relationships", - FSEND ); + m_pSerializer->startElementNS( XML_w, nBody, m_rExport.MainXmlNamespaces(m_pSerializer) ); sal_Int32 nIndex = 0; diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index cd5450ed7cc4..950db249f066 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -246,9 +246,6 @@ private: /// Write word/embeddings/Worksheet[n].xlsx void WriteEmbeddings(); - /// All xml namespaces to be used at the top of any text .xml file (main doc, headers, footers,...) - sax_fastparser::XFastAttributeListRef MainXmlNamespaces( sax_fastparser::FSHelperPtr serializer ); - /// Get background color of the document, if there is one. boost::optional<const SvxBrushItem*> getBackground(); @@ -256,6 +253,9 @@ private: bool isMirroredMargin(); public: + /// All xml namespaces to be used at the top of any text .xml file (main doc, headers, footers,...) + sax_fastparser::XFastAttributeListRef MainXmlNamespaces( sax_fastparser::FSHelperPtr serializer ); + /// FIXME this is temporary, remotely reminding the method of the same /// name in WW8Export. void WriteMainText(); |