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 /sax | |
| 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 'sax')
| -rw-r--r-- | sax/source/expatwrap/saxwriter.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index c9d0a9b48cce..e35bb5c2b0e3 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/io/XActiveDataSource.hpp> +#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> @@ -212,14 +213,13 @@ inline sal_uInt32 SaxWriterHelper::writeSequence() { m_out->writeBytes( m_Sequence ); } - catch (const IOException & e) + catch (const IOException &) { - Any a; - a <<= e; + css::uno::Any anyEx = cppu::getCaughtException(); throw SAXException( "IO exception during writing", Reference< XInterface > (), - a ); + anyEx ); } nLastLineFeedPos -= SEQUENCESIZE; return 0; @@ -1088,14 +1088,13 @@ void SAXWriter::endDocument() { m_out->closeOutput(); } - catch (const IOException & e) + catch (const IOException &) { - Any a; - a <<= e; + css::uno::Any anyEx = cppu::getCaughtException(); throw SAXException( "IO exception during closing the IO Stream", Reference< XInterface > (), - a ); + anyEx ); } } |