[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - embeddedobj/source

[Michael Stahl]

 embeddedobj/source/msole/oleembed.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b0bee59347aefe41b4c48919c8b4177572d2d348
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sun Feb 10 00:18:46 2013 +0100

    fdo#60491: embeddedobj: catch exception in fallback path
    
    This allows the OLE object to at least be passed to the OS for
    opening...
    
    Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
    (cherry picked from commit 5a65ca67d9acefed399ed8706efa402c543bed87)
    Reviewed-on: https://gerrit.libreoffice.org/2097
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index b44d789..5c5b063 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -716,7 +716,14 @@ namespace
                 aArgs ), uno::UNO_QUERY_THROW );
 
         uno::Reference< io::XStream > xCONTENTS;
-        xNameContainer->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CONTENTS"))) >>= xCONTENTS;
+        try
+        {
+            xNameContainer->getByName("CONTENTS") >>= xCONTENTS;
+        }
+        catch (container::NoSuchElementException const&)
+        {
+            // ignore
+        }
 
         sal_Bool bCopied = xCONTENTS.is() && lcl_CopyStream(xCONTENTS->getInputStream(), xStream->getOutputStream());