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 /sw/source/core/unocore/unotext.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 'sw/source/core/unocore/unotext.cxx')
| -rw-r--r-- | sw/source/core/unocore/unotext.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index b16ea0ab3d92..5fd149373e0a 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -35,6 +35,7 @@ #include <comphelper/profilezone.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> +#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> #include <cmdid.h> @@ -345,7 +346,9 @@ SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange, catch (const lang::IllegalArgumentException& iae) { // stupid method not allowed to throw iae - throw uno::RuntimeException(iae.Message, nullptr); + css::uno::Any anyEx = cppu::getCaughtException(); + throw lang::WrappedTargetRuntimeException( iae.Message, + uno::Reference< uno::XInterface >(), anyEx ); } } if (bAbsorb) @@ -1461,10 +1464,10 @@ SwXText::insertTextContentWithProperties( } catch (const uno::Exception& e) { + css::uno::Any anyEx = cppu::getCaughtException(); m_pImpl->m_pDoc->GetIDocumentUndoRedo().EndUndo(SwUndoId::INSERT, nullptr); - lang::WrappedTargetRuntimeException wrapped; - wrapped.TargetException <<= e; - throw wrapped; + throw lang::WrappedTargetRuntimeException( e.Message, + uno::Reference< uno::XInterface >(), anyEx ); } } m_pImpl->m_pDoc->GetIDocumentUndoRedo().EndUndo(SwUndoId::INSERT, nullptr); |