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

[Caolán McNamara]

 embeddedobj/source/msole/oleembed.cxx |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit 8db9cfd2973b3e6f0c682fe8961540d528e6d493
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 9 09:24:11 2017 +0100

    Related: tdf#62702 handle EmbeddedOdf like CONTENTS on ole activate attempt
    
    Change-Id: I11f1d6ad049cada1cadfe97a440b7ae562ba4ced

diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index e5bd8646aac9..fd9bb68ecc1c 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -715,6 +715,19 @@ namespace
         }
 
         bool bCopied = xCONTENTS.is() && lcl_CopyStream(xCONTENTS->getInputStream(), xStream->getOutputStream());
+        if (!bCopied)
+        {
+            uno::Reference< io::XStream > xEmbeddedOdf;
+            try
+            {
+                xNameContainer->getByName("EmbeddedOdf") >>= xEmbeddedOdf;
+            }
+            catch (container::NoSuchElementException const&)
+            {
+                // ignore
+            }
+            bCopied = xEmbeddedOdf.is() && lcl_CopyStream(xEmbeddedOdf->getInputStream(), xStream->getOutputStream());
+        }
 
         if (!bCopied)
         {