summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRavindra Vidhate <ravindra.vidhate@synerzip.com>2014-05-22 15:39:25 +0530
committerMichael Stahl <mstahl@redhat.com>2014-06-11 16:05:20 +0200
commit37f93938ad4520cebf1e9cca7859cbf77ab5f766 (patch)
tree89b515ef0161a77766e7d607323e3217bc2292d1
parent1fbda7a5eda2c3ef2b0bd779ae81c38d83714503 (diff)
fdo#79062 File having Footnote with Text Effect got corrupted after RT
When we do the export of the file, In the footnotes.xml, the w14 namespaces were not being added. This issue exists for EndNotes as well. Reviewed-on: https://gerrit.libreoffice.org/9439 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 4002fae08754aec38873bc453f991773ec6536f0) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I6494bbf1beaa0666743d9c1bb85a64f8bda20398
-rw-r--r--sw/qa/extras/ooxmlexport/data/fdo79062.docxbin0 -> 17422 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx13
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx5
-rw-r--r--sw/source/filter/ww8/docxexport.hxx6
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
new file mode 100644
index 000000000000..181ea7283610
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/fdo79062.docx
Binary files differ
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();