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 /chart2 | |
| 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 'chart2')
| -rw-r--r-- | chart2/source/controller/sidebar/Chart2PanelFactory.cxx | 6 | ||||
| -rw-r--r-- | chart2/source/tools/WrappedPropertySet.cxx | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx index 4034156f289d..19ce79f8fad7 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx @@ -26,6 +26,7 @@ #include <rtl/ref.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> +#include <cppuhelper/exc_hlp.hxx> #include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/supportsservice.hxx> @@ -109,11 +110,12 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement ( { throw; } - catch (const css::uno::Exception& e) + catch (const css::uno::Exception&) { + css::uno::Any anyEx = cppu::getCaughtException(); throw css::lang::WrappedTargetRuntimeException( "ChartPanelFactory::createUIElement exception", - nullptr, css::uno::Any(e)); + nullptr, anyEx ); } return xElement; diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index b63d25dfeea7..72c296ea6185 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -127,10 +127,9 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam } catch( const uno::Exception& ex ) { + css::uno::Any anyEx = cppu::getCaughtException(); OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue"); - lang::WrappedTargetException aWrappedException; - aWrappedException.TargetException <<= ex; - throw aWrappedException; + throw lang::WrappedTargetException( ex.Message, nullptr, anyEx ); } } Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName ) @@ -165,10 +164,9 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName } catch( const uno::Exception& ex ) { + css::uno::Any anyEx = cppu::getCaughtException(); OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue"); - lang::WrappedTargetException aWrappedException; - aWrappedException.TargetException <<= ex; - throw aWrappedException; + throw lang::WrappedTargetException( ex.Message, nullptr, anyEx ); } return aRet; |