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 /desktop/source/deployment/gui/dp_gui_theextmgr.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 'desktop/source/deployment/gui/dp_gui_theextmgr.cxx')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 94a8dd09df6c..fb883e15b82e 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -24,11 +24,13 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> +#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/TerminationVetoException.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <comphelper/propertysequence.hxx> +#include <cppuhelper/exc_hlp.hxx> #include "dp_gui_dialog2.hxx" #include "dp_gui_extensioncmdqueue.hxx" @@ -202,7 +204,9 @@ void TheExtensionManager::checkUpdates() } catch ( const ucb::CommandAbortedException & ) { return; } catch ( const lang::IllegalArgumentException & e ) { - throw uno::RuntimeException( e.Message, e.Context ); + css::uno::Any anyEx = cppu::getCaughtException(); + throw css::lang::WrappedTargetRuntimeException( e.Message, + e.Context, anyEx ); } for ( sal_Int32 i = 0; i < xAllPackages.getLength(); ++i ) @@ -281,7 +285,9 @@ void TheExtensionManager::createPackageList() } catch ( const ucb::CommandAbortedException & ) { return; } catch ( const lang::IllegalArgumentException & e ) { - throw uno::RuntimeException( e.Message, e.Context ); + css::uno::Any anyEx = cppu::getCaughtException(); + throw css::lang::WrappedTargetRuntimeException( e.Message, + e.Context, anyEx ); } for ( sal_Int32 i = 0; i < xAllPackages.getLength(); ++i ) |