[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

 sw/source/filter/ww8/docxattributeoutput.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 3ffb06e76be9be7499f12973139949ddbf6297b9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 10 22:47:27 2014 +0200

    fdo#80410: sw: DOCX export: support DOCX embedded objects
    
    Change-Id: Ifa9e12eee4139a9c9c5d17a349ff3511c62b3ea8

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index ddd2379..168fa9d 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";