diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-06-05 19:17:13 +0200 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-06-06 14:00:26 +0200 |
| commit | 3da69f954cdd69f2762859395b963733608276e9 (patch) | |
| tree | 06fca7c32b77942609bbca0e6a8253d40bbad1ca | |
| parent | 2f268cc14b3e3eab16b6bacf546431122acfdb7a (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.
(cherry-picked from commit 06a5bbd720b89d629ebf6ccf0d9a62a77c2d9a28)
Change-Id: Id91269e49c0effb35415ae8827ff949e69e7063f
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 5ab268343812..ac9c63fadd65 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4142,12 +4142,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"; |