diff options
Diffstat (limited to 'framework/source/dispatch')
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 12 | ||||
| -rw-r--r-- | framework/source/dispatch/dispatchinformationprovider.cxx | 4 | ||||
| -rw-r--r-- | framework/source/dispatch/dispatchprovider.cxx | 4 | ||||
| -rw-r--r-- | framework/source/dispatch/interceptionhelper.cxx | 10 | ||||
| -rw-r--r-- | framework/source/dispatch/loaddispatcher.cxx | 10 | ||||
| -rw-r--r-- | framework/source/dispatch/mailtodispatcher.cxx | 12 | ||||
| -rw-r--r-- | framework/source/dispatch/menudispatcher.cxx | 10 | ||||
| -rw-r--r-- | framework/source/dispatch/oxt_handler.cxx | 6 | ||||
| -rw-r--r-- | framework/source/dispatch/popupmenudispatcher.cxx | 22 | ||||
| -rw-r--r-- | framework/source/dispatch/servicehandler.cxx | 12 | ||||
| -rw-r--r-- | framework/source/dispatch/startmoduledispatcher.cxx | 12 | ||||
| -rw-r--r-- | framework/source/dispatch/systemexec.cxx | 12 |
12 files changed, 63 insertions, 63 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 696a7518ded8..042250975ecc 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -89,14 +89,14 @@ CloseDispatcher::~CloseDispatcher() void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGroups() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence< sal_Int16 > lGroups(2); lGroups[0] = css::frame::CommandGroup::VIEW; @@ -106,7 +106,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGro css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { if (nCommandGroup == css::frame::CommandGroup::VIEW) { @@ -132,14 +132,14 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: void SAL_CALL CloseDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { } void SAL_CALL CloseDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { } @@ -147,7 +147,7 @@ void SAL_CALL CloseDispatcher::removeStatusListener(const css::uno::Reference< c void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index e65b925a22d7..84eb4316ab87 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -48,7 +48,7 @@ DispatchInformationProvider::~DispatchInformationProvider() css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupportedCommandGroups() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider = implts_getAllSubProvider(); sal_Int32 c1 = lProvider.getLength(); @@ -80,7 +80,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformationProvider::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider = implts_getAllSubProvider(); sal_Int32 c1 = lProvider.getLength(); diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 8ef54766be83..2f855dfd5e10 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -102,7 +102,7 @@ DispatchProvider::~DispatchProvider() */ css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDispatch( const css::util::URL& aURL , const OUString& sTargetFrameName , - sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ) + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -137,7 +137,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDis @threadsafe yes */ -css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL DispatchProvider::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException ) +css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL DispatchProvider::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException, std::exception ) { // Create return list - which must have same size then the given descriptor // It's not allowed to pack it! diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 37ff33e95d40..370d07674063 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -50,7 +50,7 @@ InterceptionHelper::~InterceptionHelper() css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryDispatch(const css::util::URL& aURL , const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE { ReadGuard aReadLock(m_aLock); @@ -89,7 +89,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD } css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL InterceptionHelper::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { sal_Int32 c = lDescriptor.getLength(); css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatches (c); @@ -103,7 +103,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Inte } void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // reject wrong calling of this interface method css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); @@ -183,7 +183,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css: } void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // reject wrong calling of this interface method css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); @@ -231,7 +231,7 @@ void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css:: #define FORCE_DESTRUCTION_OF_INTERCEPTION_CHAIN void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { #ifdef FORCE_DESTRUCTION_OF_INTERCEPTION_CHAIN // SAFE -> diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 8b0610bcbc0e..68a6524fe4c6 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -46,34 +46,34 @@ LoadDispatcher::~LoadDispatcher() void SAL_CALL LoadDispatcher::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { impl_dispatch( aURL, lArguments, xListener ); } void SAL_CALL LoadDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { impl_dispatch( aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >() ); } css::uno::Any SAL_CALL LoadDispatcher::dispatchWithReturnValue( const css::util::URL& rURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { return impl_dispatch( rURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } void SAL_CALL LoadDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { } void SAL_CALL LoadDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { } diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 80d642d0962e..bd1c2c622a91 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -89,7 +89,7 @@ MailToDispatcher::~MailToDispatcher() */ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDispatch( const css::util::URL& aURL , const OUString& /*sTarget*/ , - sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException ) + sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; if (aURL.Complete.startsWith("mailto:")) @@ -103,7 +103,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDis @short do the same like dispatch() but for multiple requests at the same time @descr - */ -css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL MailToDispatcher::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ) +css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL MailToDispatcher::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) { sal_Int32 nCount = lDescriptor.getLength(); css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); @@ -131,7 +131,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail list of optional arguments for this mail request */ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ) + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { // dispatch() is an [oneway] call ... and may our user release his reference to us immediately. // So we should hold us self alive till this call ends. @@ -156,7 +156,7 @@ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL& */ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, - const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException ) + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { // This class was designed to die by reference. And if user release his reference to us immediately after calling this method // we can run into some problems. So we hold us self alive till this method ends. @@ -240,7 +240,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& URL about listener will be informed, if something occurred */ void SAL_CALL MailToDispatcher::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } @@ -248,7 +248,7 @@ void SAL_CALL MailToDispatcher::addStatusListener( const css::uno::Reference< cs void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 6742625c6029..c5e006ba4719 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -102,7 +102,7 @@ MenuDispatcher::~MenuDispatcher() // XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::dispatch( const URL& /*aURL*/ , - const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) + const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException, std::exception ) { } @@ -110,7 +110,7 @@ void SAL_CALL MenuDispatcher::dispatch( const URL& / // XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) throw( RuntimeException ) + const URL& aURL ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -125,7 +125,7 @@ void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStat // XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) throw( RuntimeException ) + const URL& aURL ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -140,7 +140,7 @@ void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< X // XFrameActionListener //***************************************************************************************************************** -void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException ) +void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -178,7 +178,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro //***************************************************************************************************************** // XEventListener //***************************************************************************************************************** -void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException ) +void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index c659162dc286..2227ddf94413 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -116,7 +116,7 @@ Oxt_Handler::~Oxt_Handler() void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { // SAFE { ResetableGuard aLock( m_aLock ); @@ -145,7 +145,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL, void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { dispatchWithNotification( aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >() ); } @@ -175,7 +175,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& @threadsafe yes *//*-*************************************************************************************************************/ OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { // Our default is "nothing". So we can return it, if detection failed or fily type is really unknown. OUString sTypeName; diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 0ba7e6c01888..bc12aa3c9d1d 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -79,19 +79,19 @@ PopupMenuDispatcher::~PopupMenuDispatcher() // and a dtor isn't the best place to do that! } -OUString SAL_CALL PopupMenuDispatcher::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL PopupMenuDispatcher::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { return impl_getStaticImplementationName(); } sal_Bool SAL_CALL PopupMenuDispatcher::supportsService( const OUString& sServiceName ) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL PopupMenuDispatcher::getSupportedServiceNames() - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { return impl_getStaticSupportedServiceNames(); } @@ -145,7 +145,7 @@ DEFINE_INIT_SERVICE(PopupMenuDispatcher, ) void SAL_CALL PopupMenuDispatcher::initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) -throw( css::uno::Exception, css::uno::RuntimeException) +throw( css::uno::Exception, css::uno::RuntimeException, std::exception) { css::uno::Reference< css::frame::XFrame > xFrame; @@ -175,7 +175,7 @@ SAL_CALL PopupMenuDispatcher::queryDispatch( const css::util::URL& rURL , const OUString& sTarget , sal_Int32 nFlags ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatch; @@ -237,7 +237,7 @@ throw( css::uno::RuntimeException ) css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL PopupMenuDispatcher::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { sal_Int32 nCount = lDescriptor.getLength(); css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); @@ -252,13 +252,13 @@ throw( css::uno::RuntimeException ) } void SAL_CALL PopupMenuDispatcher::dispatch( const URL& /*aURL*/, const Sequence< PropertyValue >& /*seqProperties*/ ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { } void SAL_CALL PopupMenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, const URL& aURL ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -269,7 +269,7 @@ throw( RuntimeException ) void SAL_CALL PopupMenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, const URL& aURL ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -279,7 +279,7 @@ throw( RuntimeException ) } void SAL_CALL PopupMenuDispatcher::frameAction( const FrameActionEvent& aEvent ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -291,7 +291,7 @@ throw ( RuntimeException ) } } -void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeException ) +void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index bd4f2ccc104a..b6ee2f5155e6 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -91,7 +91,7 @@ ServiceHandler::~ServiceHandler() */ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispatch( const css::util::URL& aURL , const OUString& /*sTarget*/ , - sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException ) + sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; if (aURL.Complete.startsWith(PROTOCOL_VALUE)) @@ -105,7 +105,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispa @short do the same like dispatch() but for multiple requests at the same time @descr - */ -css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL ServiceHandler::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ) +css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL ServiceHandler::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) { sal_Int32 nCount = lDescriptor.getLength(); css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); @@ -132,7 +132,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv list of optional arguments for this request */ void SAL_CALL ServiceHandler::dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ) + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { // dispatch() is an [oneway] call ... and may our user release his reference to us immediately. // So we should hold us self alive till this call ends. @@ -157,7 +157,7 @@ void SAL_CALL ServiceHandler::dispatch( const css::util::URL& */ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, - const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException ) + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { // This class was designed to die by reference. And if user release his reference to us immediately after calling this method // we can run into some problems. So we hold us self alive till this method ends. @@ -270,7 +270,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con URL about listener will be informed, if something occurred */ void SAL_CALL ServiceHandler::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } @@ -278,7 +278,7 @@ void SAL_CALL ServiceHandler::addStatusListener( const css::uno::Reference< css: void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index a7627ab17580..90c5b6e613c4 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -73,7 +73,7 @@ StartModuleDispatcher::~StartModuleDispatcher() void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } @@ -82,7 +82,7 @@ void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { ::sal_Int16 nResult = css::frame::DispatchResultState::DONTKNOW; if ( aURL.Complete == CMD_UNO_SHOWSTARTMODULE ) @@ -100,14 +100,14 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U css::uno::Sequence< ::sal_Int16 > SAL_CALL StartModuleDispatcher::getSupportedCommandGroups() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence< ::sal_Int16 >(); } css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL StartModuleDispatcher::getConfigurableDispatchInformation(::sal_Int16 /*nCommandGroup*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::frame::DispatchInformation >(); } @@ -115,14 +115,14 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL StartModuleDispat void SAL_CALL StartModuleDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { } void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { } diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index cd6d9d83736a..7ae5c5f91914 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -75,7 +75,7 @@ SystemExec::~SystemExec() css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL& aURL , const OUString&, - sal_Int32 ) throw( css::uno::RuntimeException ) + sal_Int32 ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; if (aURL.Complete.startsWith(PROTOCOL_VALUE)) @@ -85,7 +85,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( -css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ) +css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) { sal_Int32 nCount = lDescriptor.getLength(); css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); @@ -102,7 +102,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst void SAL_CALL SystemExec::dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ) + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } @@ -111,7 +111,7 @@ void SAL_CALL SystemExec::dispatch( const css::util::URL& void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >&, - const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException ) + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { // convert "systemexec:file:///c:/temp/test.html" => "file:///c:/temp/test.html" sal_Int32 c = aURL.Complete.getLength()-PROTOCOL_LENGTH; @@ -150,7 +150,7 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >&, - const css::util::URL& ) throw( css::uno::RuntimeException ) + const css::util::URL& ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } @@ -158,7 +158,7 @@ void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::fra void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >&, - const css::util::URL& ) throw( css::uno::RuntimeException ) + const css::util::URL& ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } |