diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-10 00:18:46 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-03-04 17:19:46 +0100 |
| commit | 189a3d6a1c9bc7b7bcef01ec36df99d3059e72d9 (patch) | |
| tree | 40a44fdea6960e281fa8e42438d24f08563647ae | |
| parent | dc2319586b0c225eb41a3a54b2e82149583bcc8a (diff) | |
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@redhat.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
| -rw-r--r-- | embeddedobj/source/msole/oleembed.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index b44d789cbc77..5c5b0633f892 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()); |