summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/qa/extras/ooxmlexport/data/fdo80522.docxbin0 -> 31344 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docxbin0 -> 50693 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/data/fdo80523_sldm.docxbin0 -> 50663 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx39
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx18
5 files changed, 57 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80522.docx b/sw/qa/extras/ooxmlexport/data/fdo80522.docx
new file mode 100644
index 000000000000..9445b733f584
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/fdo80522.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docx b/sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docx
new file mode 100644
index 000000000000..3140f3b6d6bd
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80523_sldm.docx b/sw/qa/extras/ooxmlexport/data/fdo80523_sldm.docx
new file mode 100644
index 000000000000..e50cda1a5109
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/fdo80523_sldm.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c62b75050e81..da32d577fa29 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3556,6 +3556,45 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79817,"fdo79817.docx")
#endif
+DECLARE_OOXMLEXPORT_TEST(testfdo80522,"fdo80522.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+ if (!pXmlDoc)
+ return;
+
+ assertXPath(pXmlDoc,
+ "/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-word.document.macroEnabled.12']",
+ "PartName",
+ "/word/embeddings/oleObject1.docm");
+}
+
+DECLARE_OOXMLEXPORT_TEST(testfdo80523_pptm,"fdo80523_pptm.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+ if (!pXmlDoc)
+ return;
+
+ assertXPath(pXmlDoc,
+ "/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-powerpoint.presentation.macroEnabled.12']",
+ "PartName",
+ "/word/embeddings/oleObject1.pptm");
+}
+
+DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,"fdo80523_sldm.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+ if (!pXmlDoc)
+ return;
+
+ assertXPath(pXmlDoc,
+ "/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-powerpoint.slide.macroEnabled.12']",
+ "PartName",
+ "/word/embeddings/oleObject1.sldm");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7b2db2e14adf..0e7538a68625 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4169,6 +4169,12 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S
sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
sFileExtension = "pptx";
}
+ else if(sProgID == "PowerPoint.ShowMacroEnabled.12")
+ {
+ sMediaType = "application/vnd.ms-powerpoint.presentation.macroEnabled.12";
+ sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
+ sFileExtension = "pptm";
+ }
else if( sProgID.startsWith("PowerPoint.Show") )
{
sMediaType = "application/vnd.ms-powerpoint";
@@ -4181,6 +4187,18 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S
sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
sFileExtension = "sldx";
}
+ else if( sProgID == "PowerPoint.SlideMacroEnabled.12" )
+ {
+ sMediaType = "application/vnd.ms-powerpoint.slide.macroEnabled.12";
+ sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
+ sFileExtension = "sldm";
+ }
+ else if( sProgID == "Word.DocumentMacroEnabled.12" )
+ {
+ sMediaType = "application/vnd.ms-word.document.macroEnabled.12";
+ sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
+ sFileExtension = "docm";
+ }
else
{
sMediaType = "application/vnd.openxmlformats-officedocument.oleObject";