[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - embeddedobj/source

[Michael Stahl]

 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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - embeddedobj/source

[Michael Stahl]

 embeddedobj/source/msole/emboleobj.windows.component |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf9157f9cc26446f0c25e85393fbe3a7603455d2
Author: Michael Stahl mst...@redhat.com
Date:   Fri Feb 8 19:29:07 2013 +0100

fdo#60234 fdo#60492: fix emboleobj library on WNT:

Use prefix consistently in all component files for the library.
(regression from 393588ce8e698203dd87a87eb506afb551457717)

Change-Id: I58dce631f474e022be320c748f62238953a28e17
(cherry picked from commit 63ca871bf8f14e0450e5da0dbcfa3ee5d48f1604)
Reviewed-on: https://gerrit.libreoffice.org/2055
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/embeddedobj/source/msole/emboleobj.windows.component 
b/embeddedobj/source/msole/emboleobj.windows.component
index d70f7dc..ac823ee 100644
--- a/embeddedobj/source/msole/emboleobj.windows.component
+++ b/embeddedobj/source/msole/emboleobj.windows.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  --
 
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=emboleobj
 xmlns=http://openoffice.org/2010/uno-components;
   implementation name=com.sun.star.comp.embed.MSOLEObjectSystemCreator
 service name=com.sun.star.comp.embed.MSOLEObjectSystemCreator/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits