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 /sc/source/ui/vba/vbarange.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 'sc/source/ui/vba/vbarange.cxx')
| -rw-r--r-- | sc/source/ui/vba/vbarange.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 2ad45a3716a8..9d2b78693fee 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -22,6 +22,7 @@ #include <vbahelper/helperdecl.hxx> #include <comphelper/unwrapargs.hxx> +#include <cppuhelper/exc_hlp.hxx> #include <o3tl/any.hxx> #include <sfx2/objsh.hxx> @@ -61,6 +62,7 @@ #include <com/sun/star/table/TableSortField.hpp> #include <com/sun/star/util/XMergeable.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> @@ -2981,7 +2983,9 @@ ScVbaRange::getHidden() } catch( const uno::Exception& e ) { - throw uno::RuntimeException( e.Message ); + css::uno::Any anyEx = cppu::getCaughtException(); + throw css::lang::WrappedTargetRuntimeException( e.Message, + nullptr, anyEx ); } return uno::makeAny( !bIsVisible ); } @@ -3008,7 +3012,9 @@ ScVbaRange::setHidden( const uno::Any& _hidden ) } catch( const uno::Exception& e ) { - throw uno::RuntimeException( e.Message ); + css::uno::Any anyEx = cppu::getCaughtException(); + throw css::lang::WrappedTargetRuntimeException( e.Message, + nullptr, anyEx ); } } |