summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authoryogesh.bharate001 <yogesh.bharate@synerzip.com>2015-07-15 15:57:58 +0530
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-11-16 09:30:45 +0000
commit0f64e580ff08a6f76327f0b77f79abbbb044d009 (patch)
tree3e4c3617d59cfbbc2a6d74a13d2a717fe0a3eb98 /sw/qa
parent7dd6b261853ad53207fe5c367f98c4db1dfd54dc (diff)
tdf#92754: Excel Chart content type is not exported properly.
Problem Description : - Excel chart contenttype is not exported properly, it exported the .xls file as .bin file. - Due to this when we open the roundtrip file back in MS Office, the embedded excel chart is not open and gives ERROR. Solution : Added support for embedded .xls for docx file. Change-Id: I16e18ffa4f6c72526665ff9d34d6c6053278c2c5 Reviewed-on: https://gerrit.libreoffice.org/17066 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/extras/ooxmlexport/data/EmbeddedExcelChart.docxbin0 -> 21785 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport4.cxx12
2 files changed, 12 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/EmbeddedExcelChart.docx b/sw/qa/extras/ooxmlexport/data/EmbeddedExcelChart.docx
new file mode 100644
index 000000000000..567660b8e1d0
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/EmbeddedExcelChart.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index a85f202bd98c..238cbde20152 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -797,7 +797,19 @@ DECLARE_OOXMLEXPORT_TEST(testSimpleSdts, "simple-sdts.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:picture", 1);
assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:group", 1);
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:citation", 1);
+}
+DECLARE_OOXMLEXPORT_TEST(testEmbeddedExcelChart, "EmbeddedExcelChart.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+ if (!pXmlDoc) // only test the export, not initial import
+ return;
+
+ assertXPath(pXmlDoc,
+ "/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/oleObject1.xls']",
+ "ContentType",
+ "application/vnd.ms-excel");
}
DECLARE_OOXMLEXPORT_TEST(testTdf83227, "tdf83227.docx")