diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-10 00:18:46 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-13 08:59:09 +0000 |
| commit | 27a69f957dc981ed42d594a8a4ebf9baba08d372 (patch) | |
| tree | 41907ec926155665aa9d6b1580ccccccc626fc9a | |
| parent | b1004870a37aba0232c451580ca21d33184bbeca (diff) | |
fdo#60491: embeddedobj: catch exception in fallback path
This allows the OLE object to at least be passed to the OS for
opening...
(cherry picked from commit 5a65ca67d9acefed399ed8706efa402c543bed87)
Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
Reviewed-on: https://gerrit.libreoffice.org/2096
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 ccf816153bdc..2cd399b29570 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -709,7 +709,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()); |