diff options
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/protocolhandler/scripthandler.cxx | 12 | ||||
| -rw-r--r-- | scripting/source/provider/ActiveMSPList.cxx | 3 | ||||
| -rw-r--r-- | scripting/source/provider/ProviderCache.cxx | 15 |
3 files changed, 17 insertions, 13 deletions
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index d238bdbd300d..2933ab8b7f0d 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> +#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/script/provider/ScriptFrameworkErrorException.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> @@ -399,15 +400,12 @@ void ScriptProtocolHandler::createScriptProvider() m_xScriptProvider.set( xFac->createScriptProvider( aContext ), UNO_QUERY_THROW ); } } - catch ( const RuntimeException & e ) - { - OUString temp = "ScriptProtocolHandler::createScriptProvider(), "; - throw RuntimeException( temp.concat( e.Message ) ); - } catch ( const Exception & e ) { - OUString temp = "ScriptProtocolHandler::createScriptProvider: "; - throw RuntimeException( temp.concat( e.Message ) ); + css::uno::Any anyEx = cppu::getCaughtException(); + throw css::lang::WrappedTargetRuntimeException( + "ScriptProtocolHandler::createScriptProvider: " + e.Message, + nullptr, anyEx ); } } diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index 6b1da6093352..5411b5a474ef 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -218,10 +218,11 @@ Reference< provider::XScriptProvider > } catch( const Exception& ) { + css::uno::Any anyEx = cppu::getCaughtException(); throw lang::WrappedTargetRuntimeException( "Failed to create MasterScriptProvider for context '" + context + "'.", - *this, ::cppu::getCaughtException() ); + *this, anyEx ); } return msp; } diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx index 98103a8984e3..09cfbcb6c988 100644 --- a/scripting/source/provider/ProviderCache.cxx +++ b/scripting/source/provider/ProviderCache.cxx @@ -22,6 +22,7 @@ #include <tools/diagnose_ex.h> #include <com/sun/star/container/XContentEnumerationAccess.hpp> +#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include "ProviderCache.hxx" using namespace com::sun::star; @@ -168,10 +169,11 @@ ProviderCache::populateCache() } catch ( const Exception &e ) { - OUString temp = - "ProviderCache::populateCache: couldn't obtain XSingleComponentFactory for " - + serviceName; - throw RuntimeException( temp.concat( e.Message ) ); + css::uno::Any anyEx = cppu::getCaughtException(); + throw css::lang::WrappedTargetRuntimeException( + "ProviderCache::populateCache: couldn't obtain XSingleComponentFactory for " + serviceName + + " " + e.Message, + nullptr, anyEx ); } } @@ -185,7 +187,10 @@ ProviderCache::createProvider( ProviderDetails& details ) } catch ( const Exception& e ) { - throw RuntimeException( "ProviderCache::createProvider() Error creating provider from factory. " + e.Message ); + css::uno::Any anyEx = cppu::getCaughtException(); + throw css::lang::WrappedTargetRuntimeException( + "ProviderCache::createProvider() Error creating provider from factory. " + e.Message, + nullptr, anyEx ); } return details.provider; |