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 /writerfilter/source/filter/WriterFilter.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 'writerfilter/source/filter/WriterFilter.cxx')
| -rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index 2953c6cc3f17..a78518522ae0 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -204,11 +204,12 @@ sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& rDesc { throw; } - catch (uno::Exception const& e) + catch (uno::Exception const&) { - SAL_WARN("writerfilter", "WriterFilter::filter(): failed with " << e); + css::uno::Any anyEx = cppu::getCaughtException(); + SAL_WARN("writerfilter", "WriterFilter::filter(): failed with " << anyEx); throw lang::WrappedTargetRuntimeException("", - static_cast<OWeakObject*>(this), uno::makeAny(e)); + static_cast<OWeakObject*>(this), anyEx); } // Adding some properties to the document's grab bag for interoperability purposes: |