[Libreoffice-commits] core.git: connectivity/source

[Stephan Bergmann]

 connectivity/source/drivers/firebird/Connection.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 17e137d899de51f2cab485d4e339009954e558b5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 25 11:20:04 2016 +0200

    Improve exception construction
    
    Change-Id: I2c1d28bb7c841f594fe2fdaf5f34fcdd730d8ee2

diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index e18be5a..ba2998f 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -55,6 +55,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
+#include <cppuhelper/exc_hlp.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
@@ -846,11 +847,8 @@ void SAL_CALL Connection::documentEventOccured( const DocumentEvent& Event )
             }
             catch (const SQLException& e)
             {
-                WrappedTargetRuntimeException aExceptionWrapper;
-                aExceptionWrapper.Context = e.Context;
-                aExceptionWrapper.Message = e.Message;
-                aExceptionWrapper.TargetException <<= e;
-                throw WrappedTargetRuntimeException( aExceptionWrapper );
+                auto a = cppu::getCaughtException();
+                throw WrappedTargetRuntimeException(e.Message, e.Context, a);
             }