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

Lionel Elie Mamane lionel at mamane.lu
Tue Mar 12 08:58:59 PDT 2013


 dbaccess/source/core/dataaccess/documentcontainer.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6b26441f4b01f4e01390b9a5b4710d0932751a93
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Mar 2 08:10:14 2013 +0100

    fdo#61564 when WrappedTargetException not in specification, do not throw it!
    
    Change-Id: Id3c995557f320b1d0241f0ef5d94b1c9aeb66528
    Reviewed-on: https://gerrit.libreoffice.org/2684
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 54cda92..8b8116a 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -38,6 +38,7 @@
 #include "core_resource.hxx"
 #include "core_resource.hrc"
 #include <comphelper/namedvaluecollection.hxx>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
@@ -557,9 +558,9 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const
     {
         throw IllegalArgumentException();
     }
-    catch(const WrappedTargetException&)
+    catch(const WrappedTargetException &e)
     {
-        throw;
+        throw WrappedTargetRuntimeException(e.Message, e.Context, e.TargetException);
     }
     return xComp;
 }


More information about the Libreoffice-commits mailing list