diff options
Diffstat (limited to 'desktop/source/deployment/gui')
11 files changed, 48 insertions, 48 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index b887cb7a2047..b345c3a826e0 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -1726,12 +1726,12 @@ UpdateRequiredDialogService::UpdateRequiredDialogService( uno::Sequence< uno::An // XExecutableDialog -void UpdateRequiredDialogService::setTitle( OUString const & ) throw ( uno::RuntimeException ) +void UpdateRequiredDialogService::setTitle( OUString const & ) throw ( uno::RuntimeException, std::exception ) { } -sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException ) +sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException, std::exception ) { ::rtl::Reference< ::dp_gui::TheExtensionManager > xManager( TheExtensionManager::get( m_xComponentContext, diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 39f122e16be7..56bd021edf96 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -259,8 +259,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xComponentContext ); // XExecutableDialog - virtual void SAL_CALL setTitle( OUString const & title ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int16 SAL_CALL execute() throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( OUString const & title ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int16 SAL_CALL execute() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); }; } // namespace dp_gui diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 51afc8a3d1db..d62d4a58f83d 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -165,20 +165,20 @@ public: // XCommandEnvironment virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XInteractionHandler virtual void SAL_CALL handle( uno::Reference< task::XInteractionRequest > const & xRequest ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XProgressHandler virtual void SAL_CALL push( uno::Any const & Status ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual void SAL_CALL update( uno::Any const & Status ) - throw ( uno::RuntimeException ); - virtual void SAL_CALL pop() throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); + virtual void SAL_CALL pop() throw ( uno::RuntimeException, std::exception ); }; @@ -330,14 +330,14 @@ ProgressCmdEnv::~ProgressCmdEnv() // XCommandEnvironment uno::Reference< task::XInteractionHandler > ProgressCmdEnv::getInteractionHandler() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return this; } uno::Reference< ucb::XProgressHandler > ProgressCmdEnv::getProgressHandler() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return this; } @@ -346,7 +346,7 @@ uno::Reference< ucb::XProgressHandler > ProgressCmdEnv::getProgressHandler() // XInteractionHandler void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & xRequest ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Any request( xRequest->getRequest() ); OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); @@ -553,7 +553,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & // XProgressHandler void ProgressCmdEnv::push( uno::Any const & rStatus ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { update_( rStatus ); } @@ -580,14 +580,14 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus ) void ProgressCmdEnv::update( uno::Any const & rStatus ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { update_( rStatus ); } void ProgressCmdEnv::pop() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { update_( uno::Any() ); // no message } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 18e4f84b9342..c10ff77b3ca6 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -158,7 +158,7 @@ void Entry_Impl::checkDependencies() // ExtensionRemovedListener void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< deployment::XPackage > xPackage( rEvt.Source, uno::UNO_QUERY ); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 199e2213a624..b1fac345a581 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -107,7 +107,7 @@ public: //=================================================================================== // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; //------------------------------------------------------------------------------ diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 44083b4d2d7e..7b2d3922ff59 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -156,14 +156,14 @@ public: // XAsynchronousExecutableDialog virtual void SAL_CALL setDialogTitle( OUString const & aTitle ) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL startExecuteModal( Reference< ui::dialogs::XDialogClosedListener > const & xListener ) - throw (RuntimeException); + throw (RuntimeException, std::exception); // XJobExecutor virtual void SAL_CALL trigger( OUString const & event ) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; @@ -190,7 +190,7 @@ ServiceImpl::ServiceImpl( Sequence<Any> const& args, // XAsynchronousExecutableDialog void ServiceImpl::setDialogTitle( OUString const & title ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if ( dp_gui::TheExtensionManager::s_ExtMgr.is() ) { @@ -208,7 +208,7 @@ void ServiceImpl::setDialogTitle( OUString const & title ) void ServiceImpl::startExecuteModal( Reference< ui::dialogs::XDialogClosedListener > const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { bool bCloseDialog = true; // only used if m_bShowUpdateOnly is true ::std::auto_ptr<Application> app; @@ -297,7 +297,7 @@ void ServiceImpl::startExecuteModal( // XJobExecutor -void ServiceImpl::trigger( OUString const &rEvent ) throw (RuntimeException) +void ServiceImpl::trigger( OUString const &rEvent ) throw (RuntimeException, std::exception) { if ( rEvent == "SHOW_UPDATE_DIALOG" ) m_bShowUpdateOnly = true; diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 189f397efc6d..e8a9844606a4 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -411,7 +411,7 @@ bool TheExtensionManager::supportsOptions( const uno::Reference< deployment::XPa // XEventListener void TheExtensionManager::disposing( lang::EventObject const & rEvt ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { bool shutDown = (rEvt.Source == m_xDesktop); @@ -438,7 +438,7 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt ) // XTerminateListener void TheExtensionManager::queryTermination( ::lang::EventObject const & ) - throw ( frame::TerminationVetoException, uno::RuntimeException ) + throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception ) { DialogHelper *pDialogHelper = getDialogHelper(); @@ -460,7 +460,7 @@ void TheExtensionManager::queryTermination( ::lang::EventObject const & ) void TheExtensionManager::notifyTermination( ::lang::EventObject const & rEvt ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { disposing( rEvt ); } @@ -468,7 +468,7 @@ void TheExtensionManager::notifyTermination( ::lang::EventObject const & rEvt ) // XModifyListener void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { getDialogHelper()->prepareChecking(); createPackageList(); diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index 701fcca421cb..43262ee2da75 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -103,17 +103,17 @@ public: // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XTerminateListener virtual void SAL_CALL queryTermination( ::com::sun::star::lang::EventObject const & evt ) - throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL notifyTermination( ::com::sun::star::lang::EventObject const & evt ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XModifyListener virtual void SAL_CALL modified( ::com::sun::star::lang::EventObject const & evt ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace dp_gui diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 23e68f35abbd..8a2363c1ea4c 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -129,21 +129,21 @@ public: // XCommandEnvironment virtual cssu::Reference<css::task::XInteractionHandler > SAL_CALL - getInteractionHandler() throw (cssu::RuntimeException); + getInteractionHandler() throw (cssu::RuntimeException, std::exception); virtual cssu::Reference<css::ucb::XProgressHandler > - SAL_CALL getProgressHandler() throw (cssu::RuntimeException); + SAL_CALL getProgressHandler() throw (cssu::RuntimeException, std::exception); // XInteractionHandler virtual void SAL_CALL handle( cssu::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); // XProgressHandler virtual void SAL_CALL push( cssu::Any const & Status ) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL update( cssu::Any const & Status ) - throw (cssu::RuntimeException); - virtual void SAL_CALL pop() throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); + virtual void SAL_CALL pop() throw (cssu::RuntimeException, std::exception); }; @@ -625,13 +625,13 @@ UpdateCommandEnv::~UpdateCommandEnv() // XCommandEnvironment cssu::Reference<css::task::XInteractionHandler> UpdateCommandEnv::getInteractionHandler() -throw (cssu::RuntimeException) +throw (cssu::RuntimeException, std::exception) { return this; } cssu::Reference<css::ucb::XProgressHandler> UpdateCommandEnv::getProgressHandler() -throw (cssu::RuntimeException) +throw (cssu::RuntimeException, std::exception) { return this; } @@ -639,7 +639,7 @@ throw (cssu::RuntimeException) // XInteractionHandler void UpdateCommandEnv::handle( cssu::Reference< css::task::XInteractionRequest> const & xRequest ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { cssu::Any request( xRequest->getRequest() ); OSL_ASSERT( request.getValueTypeClass() == cssu::TypeClass_EXCEPTION ); @@ -688,16 +688,16 @@ void UpdateCommandEnv::handle( // XProgressHandler void UpdateCommandEnv::push( cssu::Any const & /*Status*/ ) -throw (cssu::RuntimeException) +throw (cssu::RuntimeException, std::exception) { } void UpdateCommandEnv::update( cssu::Any const & /*Status */) -throw (cssu::RuntimeException) +throw (cssu::RuntimeException, std::exception) { } -void UpdateCommandEnv::pop() throw (cssu::RuntimeException) +void UpdateCommandEnv::pop() throw (cssu::RuntimeException, std::exception) { } diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 9a63b1e97dc7..90b5f329f506 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -295,13 +295,13 @@ LicenseDialog::LicenseDialog( Sequence<Any> const& args, // XExecutableDialog -void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException) +void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException, std::exception) { } -sal_Int16 LicenseDialog::execute() throw (RuntimeException) +sal_Int16 LicenseDialog::execute() throw (RuntimeException, std::exception) { return vcl::solarthread::syncExecute( boost::bind( &LicenseDialog::solar_execute, this)); diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index acdf147c7e46..f90a0e806b45 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.hxx @@ -45,8 +45,8 @@ public: // XExecutableDialog virtual void SAL_CALL setTitle( OUString const & title ) - throw (css::uno::RuntimeException); - virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception); }; } #endif |