embeddedobj/source/msole/oleembed.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
New commits: commit 27a69f957dc981ed42d594a8a4ebf9baba08d372 Author: Michael Stahl <mst...@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... (cherry picked from commit 5a65ca67d9acefed399ed8706efa402c543bed87) Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52 Reviewed-on: https://gerrit.libreoffice.org/2096 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Miklos Vajna <vmik...@suse.cz> diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index ccf8161..2cd399b 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()); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits