diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-24 15:47:30 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-25 21:46:49 +0200 |
commit | 3a51daeace695ead38cfd82b3a0f1e6f25a32e0f (patch) | |
tree | af3ef1144aef6ed62f4ab99b88d13b41bd3b3694 /connectivity/source/sdbcx/VCollection.cxx | |
parent | ff3bdde2527123fc9e011ff0d93e958174632186 (diff) |
Improve re-throwing of UNO exceptions
(*) if we are already throwing a Wrapped*Exception, get the
exception using cppu::getCaughtexception.
(*) when catching and then immediately throwing UNO exceptions,
use cppu::getCaughtException to prevent exception slicing
(*) if we are going to catch an exception and then
immediately throw a RuntimeException, rather throw a
WrappedTargetRuntimeException and preserve the original exception information.
Change-Id: Ia7a501a50ae0e6f4d05186333c8517fdcb17d558
Reviewed-on: https://gerrit.libreoffice.org/54692
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/sdbcx/VCollection.cxx')
-rw-r--r-- | connectivity/source/sdbcx/VCollection.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 595b66576ed1..70f15dc4bd9d 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -27,6 +27,7 @@ #include <comphelper/enumhelper.hxx> #include <comphelper/types.hxx> #include <comphelper/property.hxx> +#include <cppuhelper/exc_hlp.hxx> #include <TConnection.hxx> #include <rtl/ustrbuf.hxx> #include <strings.hrc> @@ -533,6 +534,7 @@ ObjectType OCollection::getObject(sal_Int32 _nIndex) } catch(const SQLException& e) { + css::uno::Any anyEx = cppu::getCaughtException(); try { dropImpl(_nIndex,false); @@ -540,7 +542,7 @@ ObjectType OCollection::getObject(sal_Int32 _nIndex) catch(const Exception& ) { } - throw WrappedTargetException(e.Message,static_cast<XTypeProvider*>(this),makeAny(e)); + throw WrappedTargetException(e.Message,static_cast<XTypeProvider*>(this),anyEx); } m_pElements->setObject(_nIndex,xName); } |