Kaydet (Commit) 06a5bbd7 authored tarafından Jacobo Aragunde Pérez's avatar Jacobo Aragunde Pérez

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
üst a6992cd0
...@@ -4210,12 +4210,18 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S ...@@ -4210,12 +4210,18 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S
sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
sFileExtension = "xls"; sFileExtension = "xls";
} }
else if( sProgID.startsWith("PowerPoint.Show") ) else if( sProgID == "PowerPoint.Show.12" )
{ {
sMediaType = "application/vnd.openxmlformats-officedocument.presentationml.presentation"; sMediaType = "application/vnd.openxmlformats-officedocument.presentationml.presentation";
sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
sFileExtension = "pptx"; 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 else
{ {
sMediaType = "application/vnd.openxmlformats-officedocument.oleObject"; sMediaType = "application/vnd.openxmlformats-officedocument.oleObject";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment