summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-07-10 22:47:27 +0200
committerMichael Stahl <mstahl@redhat.com>2014-07-10 23:00:33 +0200
commit3ffb06e76be9be7499f12973139949ddbf6297b9 (patch)
treeb1b086f5f1cbd2062b2265f4b25fd6343bb8b4d0
parentd4810a814c7c7f3db2df15b62367bd1edc7040f6 (diff)
fdo#80410: sw: DOCX export: support DOCX embedded objects
Change-Id: Ifa9e12eee4139a9c9c5d17a349ff3511c62b3ea8
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index ddd23790ec58..168fa9de5a45 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4455,7 +4455,12 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S
sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
sFileExtension = "docm";
}
- //Implementation for embedded Word 97-2003 document was missing
+ else if (sProgID == "Word.Document.12")
+ {
+ sMediaType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+ sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
+ sFileExtension = "docx";
+ }
else if( sProgID == "Word.Document.8" )
{
sMediaType = "application/msword";