summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJacobo Aragunde Pérez <jaragunde@igalia.com>2014-06-05 19:17:13 +0200
committerJacobo Aragunde Pérez <jaragunde@igalia.com>2014-06-06 13:56:54 +0200
commit06a5bbd720b89d629ebf6ccf0d9a62a77c2d9a28 (patch)
tree3d3423c24a8f867e7b1fd591a11d4bdef503f0ea /sw
parenta6992cd0d7c085ba05877e6f68ac0650dd09010f (diff)
fdo#79691: Fix ppt files embedded in .docx documents
Ensure that the proper media type and relation type are written in the .docx document for a .ppt presentation, because they are different from the ones for a .pptx file. Change-Id: Id91269e49c0effb35415ae8827ff949e69e7063f
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6c03014e5af5..095137f7c60f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4210,12 +4210,18 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S
sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
sFileExtension = "xls";
}
- else if( sProgID.startsWith("PowerPoint.Show") )
+ else if( sProgID == "PowerPoint.Show.12" )
{
sMediaType = "application/vnd.openxmlformats-officedocument.presentationml.presentation";
sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
sFileExtension = "pptx";
}
+ else if( sProgID.startsWith("PowerPoint.Show") )
+ {
+ sMediaType = "application/vnd.ms-powerpoint";
+ sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
+ sFileExtension = "ppt";
+ }
else
{
sMediaType = "application/vnd.openxmlformats-officedocument.oleObject";