diff options
Diffstat (limited to 'desktop/source/deployment')
35 files changed, 344 insertions, 344 deletions
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index b5a29ed42b80..80bf6252f300 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.cxx @@ -57,9 +57,9 @@ public: Reference<XComponentContext> const & xContext ); // XProgressHandler - virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException); - virtual void SAL_CALL update( Any const & Status ) throw (RuntimeException); - virtual void SAL_CALL pop() throw (RuntimeException); + virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException, std::exception); + virtual void SAL_CALL update( Any const & Status ) throw (RuntimeException, std::exception); + virtual void SAL_CALL pop() throw (RuntimeException, std::exception); }; @@ -146,7 +146,7 @@ void ProgressLogImpl::log_write( OString const & text ) // XProgressHandler void ProgressLogImpl::push( Any const & Status ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { update( Status ); OSL_ASSERT( m_log_level >= 0 ); @@ -155,7 +155,7 @@ void ProgressLogImpl::push( Any const & Status ) void ProgressLogImpl::update( Any const & Status ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (! Status.hasValue()) return; @@ -179,7 +179,7 @@ void ProgressLogImpl::update( Any const & Status ) } -void ProgressLogImpl::pop() throw (RuntimeException) +void ProgressLogImpl::pop() throw (RuntimeException, std::exception) { OSL_ASSERT( m_log_level > 0 ); --m_log_level; 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 diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h index 81038ec5c1b8..1d65128eb559 100644 --- a/desktop/source/deployment/inc/dp_interact.h +++ b/desktop/source/deployment/inc/dp_interact.h @@ -118,7 +118,7 @@ public: inline bool isAborted() const { return m_aborted; } // XAbortChannel - virtual void SAL_CALL sendAbort() throw (css::uno::RuntimeException); + virtual void SAL_CALL sendAbort() throw (css::uno::RuntimeException, std::exception); class SAL_DLLPRIVATE Chain { diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index 4b328bf2fdaf..fc0016731e23 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -55,21 +55,21 @@ BaseCommandEnv::~BaseCommandEnv() // XCommandEnvironment Reference<task::XInteractionHandler> BaseCommandEnv::getInteractionHandler() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { return this; } Reference<ucb::XProgressHandler> BaseCommandEnv::getProgressHandler() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { return this; } void BaseCommandEnv::handle( Reference< task::XInteractionRequest> const & /*xRequest*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } @@ -119,16 +119,16 @@ void BaseCommandEnv::handle_(bool approve, bool abort, // XProgressHandler void BaseCommandEnv::push( uno::Any const & /*Status*/ ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { } void BaseCommandEnv::update( uno::Any const & /*Status */) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { } -void BaseCommandEnv::pop() throw (uno::RuntimeException) +void BaseCommandEnv::pop() throw (uno::RuntimeException, std::exception) { } //============================================================================== @@ -145,7 +145,7 @@ TmpRepositoryCommandEnv::TmpRepositoryCommandEnv( // XInteractionHandler void TmpRepositoryCommandEnv::handle( 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 ); @@ -179,7 +179,7 @@ LicenseCommandEnv::LicenseCommandEnv( // XInteractionHandler void LicenseCommandEnv::handle( 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 ); @@ -216,7 +216,7 @@ NoLicenseCommandEnv::NoLicenseCommandEnv( // XInteractionHandler void NoLicenseCommandEnv::handle( 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 ); @@ -239,7 +239,7 @@ SilentCheckPrerequisitesCommandEnv::SilentCheckPrerequisitesCommandEnv() void SilentCheckPrerequisitesCommandEnv::handle( 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 ); diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index ae50fa00426c..b944eafd4e8b 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -49,21 +49,21 @@ public: // XCommandEnvironment virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL - getInteractionHandler() throw (css::uno::RuntimeException); + getInteractionHandler() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::ucb::XProgressHandler > - SAL_CALL getProgressHandler() throw (css::uno::RuntimeException); + SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception); // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XProgressHandler virtual void SAL_CALL push( css::uno::Any const & Status ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL update( css::uno::Any const & Status ) - throw (css::uno::RuntimeException); - virtual void SAL_CALL pop() throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception); }; class TmpRepositoryCommandEnv : public BaseCommandEnv @@ -75,7 +75,7 @@ public: // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); }; @@ -98,7 +98,7 @@ public: // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); }; @@ -116,7 +116,7 @@ public: // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); }; @@ -135,7 +135,7 @@ public: // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // Set to true if a PlatformException or a DependencyException were handled. css::uno::Any m_Exception; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 7f52de4726ec..d9df8161acaa 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -204,7 +204,7 @@ Reference<css::deployment::XPackageManager> ExtensionManager::getBakRepository( } Reference<task::XAbortChannel> ExtensionManager::createAbortChannel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return new dp_misc::AbortChannel; } @@ -320,7 +320,7 @@ ExtensionManager::getExtensionsWithSameIdentifier( css::deployment::DeploymentException, ucb::CommandFailedException, lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { try { @@ -522,7 +522,7 @@ Reference<css::deployment::XPackage> ExtensionManager::backupExtension( //call to one of the repositories. uno::Sequence< Reference<css::deployment::XPackageTypeInfo> > ExtensionManager::getSupportedPackageTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getUserRepository()->getSupportedPackageTypes(); } @@ -638,7 +638,7 @@ Reference<css::deployment::XPackage> ExtensionManager::addExtension( ucb::CommandFailedException, ucb::CommandAbortedException, lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference<css::deployment::XPackage> xNewExtension; //Determine the repository to use @@ -848,7 +848,7 @@ void ExtensionManager::removeExtension( ucb::CommandFailedException, ucb::CommandAbortedException, lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Any excOccurred1; Reference<css::deployment::XPackage> xExtensionBackup; @@ -948,7 +948,7 @@ void ExtensionManager::enableExtension( ucb::CommandFailedException, ucb::CommandAbortedException, lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::osl::MutexGuard guard(getMutex()); bool bUserDisabled = false; @@ -1013,7 +1013,7 @@ sal_Int32 ExtensionManager::checkPrerequisitesAndEnable( ucb::CommandFailedException, ucb::CommandAbortedException, lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { try { @@ -1062,7 +1062,7 @@ void ExtensionManager::disableExtension( ucb::CommandFailedException, ucb::CommandAbortedException, lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::osl::MutexGuard guard(getMutex()); uno::Any excOccurred; @@ -1125,7 +1125,7 @@ uno::Sequence< Reference<css::deployment::XPackage> > ucb::CommandFailedException, ucb::CommandAbortedException, lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return getPackageManager(repository)->getDeployedPackages( xAbort, xCmdEnv); @@ -1140,7 +1140,7 @@ Reference<css::deployment::XPackage> throw (css::deployment::DeploymentException, ucb::CommandFailedException, lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return getPackageManager(repository)->getDeployedPackage( identifier, filename, xCmdEnv); @@ -1154,7 +1154,7 @@ uno::Sequence< uno::Sequence<Reference<css::deployment::XPackage> > > ucb::CommandFailedException, ucb::CommandAbortedException, lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { try { @@ -1220,7 +1220,7 @@ void ExtensionManager::reinstallDeployedExtensions( Reference<ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::DeploymentException, ucb::CommandFailedException, ucb::CommandAbortedException, - lang::IllegalArgumentException, uno::RuntimeException) + lang::IllegalArgumentException, uno::RuntimeException, std::exception) { try { @@ -1301,7 +1301,7 @@ sal_Bool ExtensionManager::synchronize( ucb::CommandFailedException, ucb::CommandAbortedException, lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { try { @@ -1439,7 +1439,7 @@ ExtensionManager::getExtensionsWithUnacceptedLicenses( OUString const & repository, Reference<ucb::XCommandEnvironment> const & xCmdEnv) throw (css::deployment::DeploymentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference<css::deployment::XPackageManager> xPackageManager = getPackageManager(repository); @@ -1448,7 +1448,7 @@ ExtensionManager::getExtensionsWithUnacceptedLicenses( } sal_Bool ExtensionManager::isReadOnlyRepository(OUString const & repository) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getPackageManager(repository)->isReadOnly(); } @@ -1466,7 +1466,7 @@ extern sdecl::ServiceDecl const serviceDecl( void ExtensionManager::addModifyListener( Reference<util::XModifyListener> const & xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { check(); rBHelper.addListener( ::getCppuType( &xListener ), xListener ); @@ -1475,7 +1475,7 @@ void ExtensionManager::addModifyListener( void ExtensionManager::removeModifyListener( Reference<util::XModifyListener> const & xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { check(); rBHelper.removeListener( ::getCppuType( &xListener ), xListener ); diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index d64ef6b0a55c..895eb9cc8aa6 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -58,19 +58,19 @@ public: // XModifyBroadcaster virtual void SAL_CALL addModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); //XExtensionManager virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL - createAbortChannel() throw (css::uno::RuntimeException); + createAbortChannel() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addExtension( OUString const & url, @@ -82,7 +82,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeExtension( OUString const & identifier, @@ -94,7 +94,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL enableExtension( css::uno::Reference<css::deployment::XPackage> const & extension, @@ -104,7 +104,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL disableExtension( css::uno::Reference<css::deployment::XPackage> const & extension, @@ -114,7 +114,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL checkPrerequisitesAndEnable( css::uno::Reference<css::deployment::XPackage> const & extension, @@ -124,7 +124,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> > SAL_CALL getDeployedExtensions( @@ -135,7 +135,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::deployment::XPackage> SAL_CALL getDeployedExtension( @@ -147,7 +147,7 @@ public: css::deployment::DeploymentException, css::ucb::CommandFailedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL getExtensionsWithSameIdentifier( @@ -158,7 +158,7 @@ public: css::deployment::DeploymentException, css::ucb::CommandFailedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > > SAL_CALL getAllExtensions( @@ -168,7 +168,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL reinstallDeployedExtensions( sal_Bool force, OUString const & repository, @@ -179,7 +179,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL synchronize( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -188,17 +188,17 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL getExtensionsWithUnacceptedLicenses( OUString const & repository, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) throw (css::deployment::DeploymentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isReadOnlyRepository(OUString const & repository) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 66fd651ca185..331cff3ae507 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -69,11 +69,11 @@ class PackageInformationProvider : // XPackageInformationProvider virtual OUString SAL_CALL getPackageLocation( const OUString& extensionId ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL isUpdateAvailable( const OUString& extensionId ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); private: @@ -138,7 +138,7 @@ OUString PackageInformationProvider::getPackageLocation( OUString SAL_CALL PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { OUString aLocationURL = getPackageLocation( OUString("user"), _sExtensionId ); @@ -162,7 +162,7 @@ PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId ) uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Sequence< uno::Sequence< OUString > > aList; @@ -273,7 +273,7 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::getExtensionList() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { const uno::Reference<deployment::XExtensionManager> mgr = deployment::ExtensionManager::get(mxContext); diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index e1d6effae671..8d2d52575d2b 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -476,7 +476,7 @@ void PackageManagerImpl::disposing() // XComponent -void PackageManagerImpl::dispose() throw (RuntimeException) +void PackageManagerImpl::dispose() throw (RuntimeException, std::exception) { //Do not call check here. We must not throw an exception here if the object //is being disposed or is already disposed. See com.sun.star.lang.XComponent @@ -485,7 +485,7 @@ void PackageManagerImpl::dispose() throw (RuntimeException) void PackageManagerImpl::addEventListener( - Reference<lang::XEventListener> const & xListener ) throw (RuntimeException) + Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception) { //Do not call check here. We must not throw an exception here if the object //is being disposed or is already disposed. See com.sun.star.lang.XComponent @@ -494,7 +494,7 @@ void PackageManagerImpl::addEventListener( void PackageManagerImpl::removeEventListener( - Reference<lang::XEventListener> const & xListener ) throw (RuntimeException) + Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception) { //Do not call check here. We must not throw an exception here if the object //is being disposed or is already disposed. See com.sun.star.lang.XComponent @@ -503,7 +503,7 @@ void PackageManagerImpl::removeEventListener( // XPackageManager -OUString PackageManagerImpl::getContext() throw (RuntimeException) +OUString PackageManagerImpl::getContext() throw (RuntimeException, std::exception) { check(); return m_context; @@ -511,7 +511,7 @@ OUString PackageManagerImpl::getContext() throw (RuntimeException) Sequence< Reference<deployment::XPackageTypeInfo> > -PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException) +PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) { OSL_ASSERT( m_xRegistry.is() ); return m_xRegistry->getSupportedPackageTypes(); @@ -519,7 +519,7 @@ PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException) Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel() - throw (RuntimeException) + throw (RuntimeException, std::exception) { check(); return new AbortChannel; @@ -529,7 +529,7 @@ Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel() void PackageManagerImpl::addModifyListener( Reference<util::XModifyListener> const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { check(); rBHelper.addListener( ::getCppuType( &xListener ), xListener ); @@ -538,7 +538,7 @@ void PackageManagerImpl::addModifyListener( void PackageManagerImpl::removeModifyListener( Reference<util::XModifyListener> const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { check(); rBHelper.removeListener( ::getCppuType( &xListener ), xListener ); @@ -686,7 +686,7 @@ Reference<deployment::XPackage> PackageManagerImpl::importExtension( Reference<XCommandEnvironment> const & xCmdEnv_ ) throw (deployment::DeploymentException, CommandFailedException, CommandAbortedException, lang::IllegalArgumentException, - RuntimeException) + RuntimeException, std::exception) { return addPackage(extension->getURL(), Sequence<beans::NamedValue>(), OUString(), xAbortChannel, xCmdEnv_); @@ -703,7 +703,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( Reference<XCommandEnvironment> const & xCmdEnv_ ) throw (deployment::DeploymentException, CommandFailedException, CommandAbortedException, lang::IllegalArgumentException, - RuntimeException) + RuntimeException, std::exception) { check(); if (m_readOnly) @@ -857,7 +857,7 @@ void PackageManagerImpl::removePackage( Reference<XCommandEnvironment> const & xCmdEnv_ ) throw (deployment::DeploymentException, CommandFailedException, CommandAbortedException, lang::IllegalArgumentException, - RuntimeException) + RuntimeException, std::exception) { check(); @@ -1050,7 +1050,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage( OUString const & id, OUString const & fileName, Reference<XCommandEnvironment> const & xCmdEnv_ ) throw (deployment::DeploymentException, CommandFailedException, - lang::IllegalArgumentException, RuntimeException) + lang::IllegalArgumentException, RuntimeException, std::exception) { check(); Reference<XCommandEnvironment> xCmdEnv; @@ -1095,7 +1095,7 @@ PackageManagerImpl::getDeployedPackages( Reference<XCommandEnvironment> const & xCmdEnv_ ) throw (deployment::DeploymentException, CommandFailedException, CommandAbortedException, lang::IllegalArgumentException, - RuntimeException) + RuntimeException, std::exception) { check(); Reference<XCommandEnvironment> xCmdEnv; @@ -1143,7 +1143,7 @@ void PackageManagerImpl::reinstallDeployedPackages( Reference<XCommandEnvironment> const & xCmdEnv_ ) throw (deployment::DeploymentException, CommandFailedException, CommandAbortedException, - lang::IllegalArgumentException, RuntimeException) + lang::IllegalArgumentException, RuntimeException, std::exception) { check(); if (!force && office_is_running()) @@ -1198,7 +1198,7 @@ void PackageManagerImpl::reinstallDeployedPackages( ::sal_Bool SAL_CALL PackageManagerImpl::isReadOnly( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_readOnly; } @@ -1426,7 +1426,7 @@ sal_Bool PackageManagerImpl::synchronize( throw (css::deployment::DeploymentException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { check(); bool bModified = false; @@ -1441,7 +1441,7 @@ sal_Bool PackageManagerImpl::synchronize( Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getExtensionsWithUnacceptedLicenses( Reference<ucb::XCommandEnvironment> const & xCmdEnv) - throw (deployment::DeploymentException, RuntimeException) + throw (deployment::DeploymentException, RuntimeException, std::exception) { ::std::vector<Reference<deployment::XPackage> > vec; @@ -1507,7 +1507,7 @@ sal_Int32 PackageManagerImpl::checkPrerequisites( css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { try { @@ -1583,7 +1583,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::CmdEnvWrapperImpl( Reference<task::XInteractionHandler> PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return m_xUserInteractionHandler; } @@ -1591,7 +1591,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler() Reference<XProgressHandler> PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return this; } @@ -1599,7 +1599,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler() // XProgressHandler void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (m_xLogFile.is()) m_xLogFile->push( Status ); @@ -1609,7 +1609,7 @@ void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status ) void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (m_xLogFile.is()) m_xLogFile->update( Status ); @@ -1618,7 +1618,7 @@ void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status ) } -void PackageManagerImpl::CmdEnvWrapperImpl::pop() throw (RuntimeException) +void PackageManagerImpl::CmdEnvWrapperImpl::pop() throw (RuntimeException, std::exception) { if (m_xLogFile.is()) m_xLogFile->pop(); diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index 4af638c73b49..1f12b331840d 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -105,16 +105,16 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper // XCommandEnvironment virtual css::uno::Reference<css::task::XInteractionHandler> SAL_CALL - getInteractionHandler() throw (css::uno::RuntimeException); + getInteractionHandler() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::ucb::XProgressHandler> SAL_CALL - getProgressHandler() throw (css::uno::RuntimeException); + getProgressHandler() throw (css::uno::RuntimeException, std::exception); // XProgressHandler virtual void SAL_CALL push( css::uno::Any const & Status ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL update( css::uno::Any const & Status ) - throw (css::uno::RuntimeException); - virtual void SAL_CALL pop() throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception); }; protected: @@ -137,31 +137,31 @@ public: const & xComponentContext, OUString const & context ); // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( css::uno::Reference<css::lang::XEventListener> const & xListener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( css::uno::Reference<css::lang::XEventListener> const & xListener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XModifyBroadcaster virtual void SAL_CALL addModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPackageManager virtual OUString SAL_CALL getContext() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (css::uno::RuntimeException); + getSupportedPackageTypes() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL - createAbortChannel() throw (css::uno::RuntimeException); + createAbortChannel() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addPackage( OUString const & url, @@ -173,7 +173,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL importExtension( css::uno::Reference<css::deployment::XPackage> const & extension, @@ -183,7 +183,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL removePackage( OUString const & id, OUString const & fileName, @@ -193,7 +193,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); OUString getDeployPath( ActivePackages::Data const & data ); css::uno::Reference<css::deployment::XPackage> SAL_CALL getDeployedPackage_( @@ -209,7 +209,7 @@ public: css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::DeploymentException, css::ucb::CommandFailedException, - css::lang::IllegalArgumentException, css::uno::RuntimeException); + css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> > getDeployedPackages_( @@ -222,7 +222,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL reinstallDeployedPackages( sal_Bool force, @@ -232,10 +232,10 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isReadOnly( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL synchronize( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -243,13 +243,13 @@ public: throw (css::deployment::DeploymentException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL getExtensionsWithUnacceptedLicenses( css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) throw (css::deployment::DeploymentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL checkPrerequisites( css::uno::Reference<css::deployment::XPackage> const & extension, @@ -259,7 +259,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); }; //______________________________________________________________________________ diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index e23dba62a555..75e41fd6292e 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -62,7 +62,7 @@ public: // XPackageManagerFactory virtual Reference<deployment::XPackageManager> SAL_CALL getPackageManager( - OUString const & context ) throw (RuntimeException); + OUString const & context ) throw (RuntimeException, std::exception); }; //============================================================================== @@ -121,7 +121,7 @@ void PackageManagerFactoryImpl::disposing() Reference<deployment::XPackageManager> PackageManagerFactoryImpl::getPackageManager( OUString const & context ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference< deployment::XPackageManager > xRet; ::osl::ResettableMutexGuard guard( getMutex() ); diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 55748c364f2a..d7763a082d7d 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -65,10 +65,10 @@ public: virtual ~EmptyNodeList(); - virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - item(::sal_Int32 index) throw (css::uno::RuntimeException); + item(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception); private: EmptyNodeList(EmptyNodeList &); // not defined @@ -79,12 +79,12 @@ EmptyNodeList::EmptyNodeList() {} EmptyNodeList::~EmptyNodeList() {} -::sal_Int32 EmptyNodeList::getLength() throw (css::uno::RuntimeException) { +::sal_Int32 EmptyNodeList::getLength() throw (css::uno::RuntimeException, std::exception) { return 0; } css::uno::Reference< css::xml::dom::XNode > EmptyNodeList::item(::sal_Int32) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException("bad EmptyNodeList com.sun.star.xml.dom.XNodeList.item call", static_cast< ::cppu::OWeakObject * >(this)); @@ -156,14 +156,14 @@ public: bool exist(); // XCommandEnvironment virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL - getInteractionHandler() throw (css::uno::RuntimeException); + getInteractionHandler() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::ucb::XProgressHandler > - SAL_CALL getProgressHandler() throw (css::uno::RuntimeException); + SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception); // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); }; ExtensionDescription::ExtensionDescription( @@ -271,13 +271,13 @@ bool FileDoesNotExistFilter::exist() } // XCommandEnvironment Reference<css::task::XInteractionHandler > - FileDoesNotExistFilter::getInteractionHandler() throw (css::uno::RuntimeException) + FileDoesNotExistFilter::getInteractionHandler() throw (css::uno::RuntimeException, std::exception) { return static_cast<css::task::XInteractionHandler*>(this); } Reference<css::ucb::XProgressHandler > - FileDoesNotExistFilter::getProgressHandler() throw (css::uno::RuntimeException) + FileDoesNotExistFilter::getProgressHandler() throw (css::uno::RuntimeException, std::exception) { return m_xCommandEnv.is() ? m_xCommandEnv->getProgressHandler() @@ -289,7 +289,7 @@ Reference<css::ucb::XProgressHandler > //of FileDoesNotExistFilter, then we do nothing void FileDoesNotExistFilter::handle( Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Any request( xRequest->getRequest() ); diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index 92c4cf97eed2..88285d8bd5a4 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -51,10 +51,10 @@ public: virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); virtual Any SAL_CALL queryInterface( Type const & type ) - throw (RuntimeException); + throw (RuntimeException, std::exception); // XInteractionContinuation - virtual void SAL_CALL select() throw (RuntimeException); + virtual void SAL_CALL select() throw (RuntimeException, std::exception); }; // XInterface @@ -72,7 +72,7 @@ void InteractionContinuationImpl::release() throw () Any InteractionContinuationImpl::queryInterface( Type const & type ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (type.isAssignableFrom( m_type )) { Reference<task::XInteractionContinuation> xThis(this); @@ -84,7 +84,7 @@ Any InteractionContinuationImpl::queryInterface( Type const & type ) // XInteractionContinuation -void InteractionContinuationImpl::select() throw (RuntimeException) +void InteractionContinuationImpl::select() throw (RuntimeException, std::exception) { *m_pselect = true; } @@ -106,21 +106,21 @@ public: // XInteractionRequest virtual Any SAL_CALL getRequest() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Sequence< Reference<task::XInteractionContinuation> > - SAL_CALL getContinuations() throw (RuntimeException); + SAL_CALL getContinuations() throw (RuntimeException, std::exception); }; // XInteractionRequest -Any InteractionRequest::getRequest() throw (RuntimeException) +Any InteractionRequest::getRequest() throw (RuntimeException, std::exception) { return m_request; } Sequence< Reference< task::XInteractionContinuation > > -InteractionRequest::getContinuations() throw (RuntimeException) +InteractionRequest::getContinuations() throw (RuntimeException, std::exception) { return m_conts; } @@ -163,7 +163,7 @@ bool interactContinuation( Any const & request, // XAbortChannel -void AbortChannel::sendAbort() throw (RuntimeException) +void AbortChannel::sendAbort() throw (RuntimeException, std::exception) { m_aborted = true; if (m_xNext.is()) diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index f79aeb1f8461..4b1d20f599aa 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -323,11 +323,11 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException); + getSupportedPackageTypes() throw (RuntimeException, std::exception); virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException); + uno::RuntimeException, std::exception); using PackageRegistryBackend::disposing; @@ -601,14 +601,14 @@ void BackendImpl::revokeEntryFromDb(OUString const & url) // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException) +BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) { return m_typeInfos; } void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) throw (deployment::DeploymentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if (m_backendDb.get()) m_backendDb->removeEntry(url); diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index a133cb5e2b3a..275e8571ee17 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -147,10 +147,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException); + getSupportedPackageTypes() throw (RuntimeException, std::exception); virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException); + uno::RuntimeException, std::exception); using PackageRegistryBackend::disposing; }; @@ -286,13 +286,13 @@ bool BackendImpl::activateEntry(OUString const & url) // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException) +BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) { return m_typeInfos; } void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) throw (deployment::DeploymentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if (m_backendDb.get()) m_backendDb->removeEntry(url); diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index ad4a63d99ac6..36e5db5a474c 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -57,7 +57,7 @@ PackageRegistryBackend::~PackageRegistryBackend() void PackageRegistryBackend::disposing( lang::EventObject const & event ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference<deployment::XPackage> xPackage( event.Source, UNO_QUERY_THROW ); @@ -141,7 +141,7 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage( throw (deployment::DeploymentException, deployment::InvalidRemovedParameterException, ucb::CommandFailedException, - lang::IllegalArgumentException, RuntimeException) + lang::IllegalArgumentException, RuntimeException, std::exception) { ::osl::ResettableMutexGuard guard( getMutex() ); check(); @@ -356,7 +356,7 @@ void Package::check() const // XComponent -void Package::dispose() throw (RuntimeException) +void Package::dispose() throw (RuntimeException, std::exception) { //Do not call check here. We must not throw an exception here if the object //is being disposed or is already disposed. See com.sun.star.lang.XComponent @@ -365,7 +365,7 @@ void Package::dispose() throw (RuntimeException) void Package::addEventListener( - Reference<lang::XEventListener> const & xListener ) throw (RuntimeException) + Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception) { //Do not call check here. We must not throw an exception here if the object //is being disposed or is already disposed. See com.sun.star.lang.XComponent @@ -374,7 +374,7 @@ void Package::addEventListener( void Package::removeEventListener( - Reference<lang::XEventListener> const & xListener ) throw (RuntimeException) + Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception) { //Do not call check here. We must not throw an exception here if the object //is being disposed or is already disposed. See com.sun.star.lang.XComponent @@ -385,7 +385,7 @@ void Package::removeEventListener( void Package::addModifyListener( Reference<util::XModifyListener> const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { check(); rBHelper.addListener( ::getCppuType( &xListener ), xListener ); @@ -394,7 +394,7 @@ void Package::addModifyListener( void Package::removeModifyListener( Reference<util::XModifyListener> const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { check(); rBHelper.removeListener( ::getCppuType( &xListener ), xListener ); @@ -413,14 +413,14 @@ void Package::checkAborted( // XPackage Reference<task::XAbortChannel> Package::createAbortChannel() - throw (RuntimeException) + throw (RuntimeException, std::exception) { check(); return new AbortChannel; } -sal_Bool Package::isBundle() throw (RuntimeException) +sal_Bool Package::isBundle() throw (RuntimeException, std::exception) { return false; // default } @@ -434,7 +434,7 @@ sal_Bool Package::isBundle() throw (RuntimeException) css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -447,7 +447,7 @@ sal_Bool Package::isBundle() throw (RuntimeException) throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -461,18 +461,18 @@ Sequence< Reference<deployment::XPackage> > Package::getBundle( Reference<XCommandEnvironment> const & ) throw (deployment::DeploymentException, CommandFailedException, CommandAbortedException, - lang::IllegalArgumentException, RuntimeException) + lang::IllegalArgumentException, RuntimeException, std::exception) { return Sequence< Reference<deployment::XPackage> >(); } -OUString Package::getName() throw (RuntimeException) +OUString Package::getName() throw (RuntimeException, std::exception) { return m_name; } -beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException) +beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException, std::exception) { if (m_bRemoved) return beans::Optional<OUString>(true, m_identifier); @@ -483,7 +483,7 @@ beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException) OUString Package::getVersion() throw ( deployment::ExtensionRemovedException, - RuntimeException) + RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -491,14 +491,14 @@ OUString Package::getVersion() throw ( } -OUString Package::getURL() throw (RuntimeException) +OUString Package::getURL() throw (RuntimeException, std::exception) { return m_url; } OUString Package::getDisplayName() throw ( - deployment::ExtensionRemovedException, RuntimeException) + deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -507,7 +507,7 @@ OUString Package::getDisplayName() throw ( OUString Package::getDescription() throw ( - deployment::ExtensionRemovedException,RuntimeException) + deployment::ExtensionRemovedException,RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -516,7 +516,7 @@ OUString Package::getDescription() throw ( OUString Package::getLicenseText() throw ( - deployment::ExtensionRemovedException,RuntimeException) + deployment::ExtensionRemovedException,RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -525,7 +525,7 @@ OUString Package::getLicenseText() throw ( Sequence<OUString> Package::getUpdateInformationURLs() throw ( - deployment::ExtensionRemovedException, RuntimeException) + deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -534,7 +534,7 @@ Sequence<OUString> Package::getUpdateInformationURLs() throw ( css::beans::StringPair Package::getPublisherInfo() throw ( - deployment::ExtensionRemovedException, RuntimeException) + deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -544,7 +544,7 @@ css::beans::StringPair Package::getPublisherInfo() throw ( uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContrast*/ ) - throw (deployment::ExtensionRemovedException, RuntimeException ) + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception ) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -555,7 +555,7 @@ uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContr Reference<deployment::XPackageTypeInfo> Package::getPackageType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return m_xPackageType; } @@ -565,7 +565,7 @@ void Package::exportTo( OUString const & destFolderURL, OUString const & newTitle, sal_Int32 nameClashAction, Reference<XCommandEnvironment> const & xCmdEnv ) throw (deployment::ExtensionRemovedException, - CommandFailedException, CommandAbortedException, RuntimeException) + CommandFailedException, CommandAbortedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -604,7 +604,7 @@ beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered( Reference<task::XAbortChannel> const & xAbortChannel, Reference<XCommandEnvironment> const & xCmdEnv ) throw (deployment::DeploymentException, - CommandFailedException, CommandAbortedException, RuntimeException) + CommandFailedException, CommandAbortedException, RuntimeException, std::exception) { try { ::osl::ResettableMutexGuard guard( getMutex() ); @@ -718,7 +718,7 @@ void Package::registerPackage( throw (deployment::DeploymentException, deployment::ExtensionRemovedException, CommandFailedException, CommandAbortedException, - lang::IllegalArgumentException, RuntimeException) + lang::IllegalArgumentException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -732,7 +732,7 @@ void Package::revokePackage( Reference<XCommandEnvironment> const & xCmdEnv ) throw (deployment::DeploymentException, CommandFailedException, CommandAbortedException, - lang::IllegalArgumentException, RuntimeException) + lang::IllegalArgumentException, RuntimeException, std::exception) { processPackage_impl( false /* revoke */, startup, xAbortChannel, xCmdEnv ); @@ -753,7 +753,7 @@ PackageRegistryBackend * Package::getMyBackend() const return pBackend; } OUString Package::getRepositoryName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { PackageRegistryBackend * backEnd = getMyBackend(); return backEnd->getContext(); @@ -761,7 +761,7 @@ OUString Package::getRepositoryName() beans::Optional< OUString > Package::getRegistrationDataURL() throw (deployment::ExtensionRemovedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -769,7 +769,7 @@ beans::Optional< OUString > Package::getRegistrationDataURL() } sal_Bool Package::isRemoved() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return m_bRemoved; } @@ -782,27 +782,27 @@ Package::TypeInfo::~TypeInfo() // XPackageTypeInfo -OUString Package::TypeInfo::getMediaType() throw (RuntimeException) +OUString Package::TypeInfo::getMediaType() throw (RuntimeException, std::exception) { return m_mediaType; } OUString Package::TypeInfo::getDescription() - throw (deployment::ExtensionRemovedException, RuntimeException) + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { return getShortDescription(); } OUString Package::TypeInfo::getShortDescription() - throw (deployment::ExtensionRemovedException, RuntimeException) + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { return m_shortDescr; } -OUString Package::TypeInfo::getFileFilter() throw (RuntimeException) +OUString Package::TypeInfo::getFileFilter() throw (RuntimeException, std::exception) { return m_fileFilter; } @@ -816,7 +816,7 @@ OUString Package::TypeInfo::getFileFilter() throw (RuntimeException) * @param smallIcon Return the small version of the icon */ Any Package::TypeInfo::getIcon( sal_Bool /*highContrast*/, sal_Bool smallIcon ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (! smallIcon) return Any(); diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index deeefa1cb2f3..07836851e5ab 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -111,7 +111,7 @@ public: Reference<XComponentContext> const & xComponentContext ); // XUpdatable - virtual void SAL_CALL update() throw (RuntimeException); + virtual void SAL_CALL update() throw (RuntimeException, std::exception); // XPackageRegistry virtual Reference<deployment::XPackage> SAL_CALL bindPackage( @@ -120,12 +120,12 @@ public: throw (deployment::DeploymentException, deployment::InvalidRemovedParameterException, CommandFailedException, - lang::IllegalArgumentException, RuntimeException); + lang::IllegalArgumentException, RuntimeException, std::exception); virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException); + getSupportedPackageTypes() throw (RuntimeException, std::exception); virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - RuntimeException); + RuntimeException, std::exception); }; @@ -180,7 +180,7 @@ OUString normalizeMediaType( OUString const & mediaType ) void PackageRegistryImpl::packageRemoved( OUString const & url, OUString const & mediaType) throw (css::deployment::DeploymentException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { const t_string2registry::const_iterator i = m_mediaType2backend.find(mediaType); @@ -444,7 +444,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( // XUpdatable: broadcast to backends -void PackageRegistryImpl::update() throw (RuntimeException) +void PackageRegistryImpl::update() throw (RuntimeException, std::exception) { check(); t_registryset::const_iterator iPos( m_allBackends.begin() ); @@ -463,7 +463,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) throw (deployment::DeploymentException, deployment::InvalidRemovedParameterException, CommandFailedException, - lang::IllegalArgumentException, RuntimeException) + lang::IllegalArgumentException, RuntimeException, std::exception) { check(); OUString mediaType(mediaType_); @@ -535,7 +535,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( Sequence< Reference<deployment::XPackageTypeInfo> > -PackageRegistryImpl::getSupportedPackageTypes() throw (RuntimeException) +PackageRegistryImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) { return comphelper::containerToSequence(m_typesInfos); } diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index ead5dd23c7fd..c5f116ab9540 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -93,10 +93,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException); + getSupportedPackageTypes() throw (RuntimeException, std::exception); virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException); + uno::RuntimeException, std::exception); using PackageRegistryBackend::disposing; }; @@ -140,7 +140,7 @@ bool BackendImpl::hasActiveEntry(OUString const & url) // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException) +BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) { return Sequence<Reference<deployment::XPackageTypeInfo> >( & m_xExecutableTypeInfo, 1); @@ -148,7 +148,7 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException) void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) throw (deployment::DeploymentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if (m_backendDb.get()) m_backendDb->removeEntry(url); diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 4b89487ea703..a9d8f577ed67 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -84,7 +84,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend //XPackage virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() - throw (deployment::ExtensionRemovedException, css::uno::RuntimeException); + throw (deployment::ExtensionRemovedException, css::uno::RuntimeException, std::exception); }; friend class PackageImpl; @@ -118,10 +118,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException); + getSupportedPackageTypes() throw (RuntimeException, std::exception); virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException); + uno::RuntimeException, std::exception); }; @@ -156,14 +156,14 @@ BackendImpl::BackendImpl( // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException) +BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) { return m_typeInfos; } void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) throw (deployment::DeploymentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if (m_backendDb.get()) m_backendDb->removeEntry(url); @@ -357,7 +357,7 @@ void BackendImpl::PackageImpl::processPackage_( beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL() throw (deployment::ExtensionRemovedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 2c8a41771cff..b2dd7445587b 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -122,40 +122,40 @@ public: {} // XPackageTypeInfo virtual OUString SAL_CALL getMediaType() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getDescription() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getShortDescription() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getFileFilter() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getIcon( sal_Bool highContrast, sal_Bool smallIcon ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); }; // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( css::uno::Reference<css::lang::XEventListener> const & xListener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( css::uno::Reference<css::lang::XEventListener> const & xListener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XModifyBroadcaster virtual void SAL_CALL addModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPackage virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL - createAbortChannel() throw (css::uno::RuntimeException); + createAbortChannel() throw (css::uno::RuntimeException, std::exception); virtual css::beans::Optional< css::beans::Ambiguous<sal_Bool> > SAL_CALL isRegistered( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -163,7 +163,7 @@ public: throw (css::deployment::DeploymentException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL checkPrerequisites( const css::uno::Reference< css::task::XAbortChannel >& xAbortChannel, @@ -173,14 +173,14 @@ public: css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL checkDependencies( const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL registerPackage( sal_Bool startup, @@ -190,7 +190,7 @@ public: css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::lang::IllegalArgumentException, css::uno::RuntimeException); + css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL revokePackage( sal_Bool startup, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -199,9 +199,9 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isBundle() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> > SAL_CALL getBundle( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -210,38 +210,38 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::beans::Optional< OUString > SAL_CALL getIdentifier() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getVersion() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getURL() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getDisplayName() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getDescription() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getLicenseText() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getUpdateInformationURLs() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::beans::StringPair SAL_CALL getPublisherInfo() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getIcon( sal_Bool bHighContrast ) throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::deployment::XPackageTypeInfo> SAL_CALL - getPackageType() throw (css::uno::RuntimeException); + getPackageType() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL exportTo( OUString const & destFolderURL, OUString const & newTitle, @@ -249,14 +249,14 @@ public: css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, css::uno::RuntimeException); + css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getRepositoryName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isRemoved() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); }; @@ -363,7 +363,7 @@ public: // XEventListener virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPackageRegistry virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL bindPackage( @@ -373,7 +373,7 @@ public: throw (css::deployment::DeploymentException, css::deployment::InvalidRemovedParameterException, css::ucb::CommandFailedException, - css::lang::IllegalArgumentException, css::uno::RuntimeException); + css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); // virtual void SAL_CALL packageRemoved( // OUString const & url, OUString const & mediaType) diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index f5c954ead33c..e15939b4a807 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -168,7 +168,7 @@ class BackendImpl : public ImplBaseT OUString const & identifier); // XPackage - virtual sal_Bool SAL_CALL isBundle() throw (RuntimeException); + virtual sal_Bool SAL_CALL isBundle() throw (RuntimeException, std::exception); virtual Sequence< Reference<deployment::XPackage> > SAL_CALL getBundle( Reference<task::XAbortChannel> const & xAbortChannel, @@ -176,12 +176,12 @@ class BackendImpl : public ImplBaseT throw (deployment::DeploymentException, ucb::CommandFailedException, ucb::CommandAbortedException, - lang::IllegalArgumentException, RuntimeException); + lang::IllegalArgumentException, RuntimeException, std::exception); virtual OUString SAL_CALL getDescription() - throw (deployment::ExtensionRemovedException, RuntimeException); + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception); virtual OUString SAL_CALL getLicenseText() - throw (deployment::ExtensionRemovedException, RuntimeException); + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception); virtual void SAL_CALL exportTo( OUString const & destFolderURL, OUString const & newTitle, @@ -190,7 +190,7 @@ class BackendImpl : public ImplBaseT throw (deployment::ExtensionRemovedException, ucb::CommandFailedException, ucb::CommandAbortedException, - RuntimeException); + RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL checkPrerequisites( const Reference< task::XAbortChannel >& xAbortChannel, @@ -200,34 +200,34 @@ class BackendImpl : public ImplBaseT deployment::DeploymentException, ucb::CommandFailedException, ucb::CommandAbortedException, - RuntimeException); + RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL checkDependencies( const Reference< ucb::XCommandEnvironment >& xCmdEnv ) throw (deployment::DeploymentException, deployment::ExtensionRemovedException, ucb::CommandFailedException, - RuntimeException); + RuntimeException, std::exception); virtual beans::Optional<OUString> SAL_CALL getIdentifier() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual OUString SAL_CALL getVersion() - throw (deployment::ExtensionRemovedException, RuntimeException); + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception); virtual Sequence<OUString> SAL_CALL getUpdateInformationURLs() - throw (deployment::ExtensionRemovedException, RuntimeException); + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception); virtual beans::StringPair SAL_CALL getPublisherInfo() - throw (deployment::ExtensionRemovedException, RuntimeException); + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception); virtual OUString SAL_CALL getDisplayName() - throw (deployment::ExtensionRemovedException, RuntimeException); + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception); virtual Reference< graphic::XGraphic > SAL_CALL getIcon( ::sal_Bool bHighContrast ) throw (deployment::ExtensionRemovedException, - RuntimeException); + RuntimeException, std::exception); }; friend class PackageImpl; @@ -257,18 +257,18 @@ public: Reference<deployment::XPackageRegistry> const & xRootRegistry ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( OUString const& name ) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (RuntimeException); + throw (RuntimeException, std::exception); // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException); + getSupportedPackageTypes() throw (RuntimeException, std::exception); virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException); + uno::RuntimeException, std::exception); using ImplBaseT::disposing; }; @@ -324,19 +324,19 @@ void BackendImpl::disposing() } // XServiceInfo -OUString BackendImpl::getImplementationName() throw (RuntimeException) +OUString BackendImpl::getImplementationName() throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.deployment.bundle.PackageRegistryBackend"); } sal_Bool BackendImpl::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence<OUString> BackendImpl::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return comphelper::makeSequence( OUString(BACKEND_SERVICE_NAME) ); @@ -345,14 +345,14 @@ Sequence<OUString> BackendImpl::getSupportedServiceNames() // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException) +BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) { return m_typeInfos; } void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) throw (deployment::DeploymentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { //Notify the backend responsible for processing the different media //types that this extension was removed. @@ -729,7 +729,7 @@ bool BackendImpl::PackageImpl::checkDependencies( css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -757,7 +757,7 @@ bool BackendImpl::PackageImpl::checkDependencies( throw (deployment::DeploymentException, deployment::ExtensionRemovedException, ucb::CommandFailedException, - RuntimeException) + RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -769,7 +769,7 @@ bool BackendImpl::PackageImpl::checkDependencies( } beans::Optional<OUString> BackendImpl::PackageImpl::getIdentifier() - throw (RuntimeException) + throw (RuntimeException, std::exception) { OUString identifier; if (m_bRemoved) @@ -783,7 +783,7 @@ beans::Optional<OUString> BackendImpl::PackageImpl::getIdentifier() } OUString BackendImpl::PackageImpl::getVersion() - throw (deployment::ExtensionRemovedException, RuntimeException) + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -791,7 +791,7 @@ OUString BackendImpl::PackageImpl::getVersion() } Sequence<OUString> BackendImpl::PackageImpl::getUpdateInformationURLs() - throw (deployment::ExtensionRemovedException, RuntimeException) + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -799,7 +799,7 @@ Sequence<OUString> BackendImpl::PackageImpl::getUpdateInformationURLs() } beans::StringPair BackendImpl::PackageImpl::getPublisherInfo() - throw (deployment::ExtensionRemovedException, RuntimeException) + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -810,7 +810,7 @@ beans::StringPair BackendImpl::PackageImpl::getPublisherInfo() uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool bHighContrast ) - throw (deployment::ExtensionRemovedException, RuntimeException ) + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception ) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -970,7 +970,7 @@ void BackendImpl::PackageImpl::processPackage_( OUString BackendImpl::PackageImpl::getDescription() - throw (deployment::ExtensionRemovedException, RuntimeException) + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -998,7 +998,7 @@ OUString BackendImpl::PackageImpl::getDescription() OUString BackendImpl::PackageImpl::getLicenseText() - throw (deployment::ExtensionRemovedException, RuntimeException) + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -1027,7 +1027,7 @@ void BackendImpl::PackageImpl::exportTo( sal_Int32 nameClashAction, Reference<ucb::XCommandEnvironment> const & xCmdEnv ) throw (ucb::CommandFailedException, deployment::ExtensionRemovedException, - ucb::CommandAbortedException, RuntimeException) + ucb::CommandAbortedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); @@ -1210,7 +1210,7 @@ void BackendImpl::PackageImpl::exportTo( } -sal_Bool BackendImpl::PackageImpl::isBundle() throw (RuntimeException) +sal_Bool BackendImpl::PackageImpl::isBundle() throw (RuntimeException, std::exception) { return true; } @@ -1221,7 +1221,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( Reference<ucb::XCommandEnvironment> const & xCmdEnv ) throw (deployment::DeploymentException, ucb::CommandFailedException, ucb::CommandAbortedException, - lang::IllegalArgumentException, RuntimeException) + lang::IllegalArgumentException, RuntimeException, std::exception) { Sequence< Reference<deployment::XPackage> > * pBundle = m_pBundle; if (pBundle == 0) @@ -1613,7 +1613,7 @@ void BackendImpl::PackageImpl::scanLegacyBundle( } OUString BackendImpl::PackageImpl::getDisplayName() - throw (deployment::ExtensionRemovedException, RuntimeException) + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) { if (m_bRemoved) throw deployment::ExtensionRemovedException(); diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index d85093cd3e43..e83014162ccd 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -99,14 +99,14 @@ public: Reference<XComponentContext> const & xComponentContext ); // XUpdatable - virtual void SAL_CALL update() throw (RuntimeException); + virtual void SAL_CALL update() throw (RuntimeException, std::exception); // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException); + getSupportedPackageTypes() throw (RuntimeException, std::exception); virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException); + uno::RuntimeException, std::exception); }; @@ -183,7 +183,7 @@ bool BackendImpl::hasActiveEntry(OUString const & url) // XUpdatable -void BackendImpl::update() throw (RuntimeException) +void BackendImpl::update() throw (RuntimeException, std::exception) { // Nothing to do here after fixing i70283!? } @@ -191,7 +191,7 @@ void BackendImpl::update() throw (RuntimeException) // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException) +BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) { return m_typeInfos; } @@ -203,7 +203,7 @@ void BackendImpl::revokeEntryFromDb(OUString const & url) void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/) throw (deployment::DeploymentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if (m_backendDb.get()) m_backendDb->removeEntry(url); diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx index 6e907f3df4a3..238153cb3630 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx @@ -37,41 +37,41 @@ namespace sfwk // XDocumentHandler void SAL_CALL ParcelDescDocHandler::startDocument() -throw ( xml::sax::SAXException, RuntimeException ) +throw ( xml::sax::SAXException, RuntimeException, std::exception ) { m_bIsParsed = false; } void SAL_CALL ParcelDescDocHandler::endDocument() -throw ( xml::sax::SAXException, RuntimeException ) +throw ( xml::sax::SAXException, RuntimeException, std::exception ) { m_bIsParsed = true; } void SAL_CALL ParcelDescDocHandler::characters( const OUString & ) - throw ( xml::sax::SAXException, RuntimeException ) + throw ( xml::sax::SAXException, RuntimeException, std::exception ) { } void SAL_CALL ParcelDescDocHandler::ignorableWhitespace( const OUString & ) - throw ( xml::sax::SAXException, RuntimeException ) + throw ( xml::sax::SAXException, RuntimeException, std::exception ) { } void SAL_CALL ParcelDescDocHandler::processingInstruction( const OUString &, const OUString & ) - throw ( xml::sax::SAXException, RuntimeException ) + throw ( xml::sax::SAXException, RuntimeException, std::exception ) { } void SAL_CALL ParcelDescDocHandler::setDocumentLocator( const Reference< xml::sax::XLocator >& ) - throw ( xml::sax::SAXException, RuntimeException ) + throw ( xml::sax::SAXException, RuntimeException, std::exception ) { } @@ -79,7 +79,7 @@ void SAL_CALL ParcelDescDocHandler::startElement( const OUString& aName, const Reference< xml::sax::XAttributeList > & xAttribs ) throw ( xml::sax::SAXException, - RuntimeException ) + RuntimeException, std::exception ) { dp_misc::TRACE("ParcelDescDocHandler::startElement() for " + @@ -101,7 +101,7 @@ ParcelDescDocHandler::startElement( const OUString& aName, } void SAL_CALL ParcelDescDocHandler::endElement( const OUString & aName ) - throw ( xml::sax::SAXException, RuntimeException ) + throw ( xml::sax::SAXException, RuntimeException, std::exception ) { if ( skipIndex ) { diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index f1339b888420..02d9cb43db69 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -48,32 +48,32 @@ public: bool isParsed() { return m_bIsParsed; } // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL endDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) throw ( css::xml::sax::SAXException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL endElement( const OUString & aName ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL characters( const OUString & aChars ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL processingInstruction( const OUString & aTarget, const OUString & aData ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); }; } } diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index c2d5442be957..c7a0fe793f84 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -75,8 +75,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend OUString const & url, OUString const & libType, bool bRemoved, OUString const & identifier); // XPackage - virtual OUString SAL_CALL getDescription() throw (RuntimeException); - virtual OUString SAL_CALL getLicenseText() throw (RuntimeException); + virtual OUString SAL_CALL getDescription() throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getLicenseText() throw (RuntimeException, std::exception); }; friend class PackageImpl; @@ -96,10 +96,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException); + getSupportedPackageTypes() throw (RuntimeException, std::exception); virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException); + uno::RuntimeException, std::exception); }; BackendImpl * BackendImpl::PackageImpl::getMyBackend() const @@ -116,7 +116,7 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const return pBackend; } -OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException) +OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException, std::exception) { if (m_descr.isEmpty()) return Package::getDescription(); @@ -125,7 +125,7 @@ OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException) } -OUString BackendImpl::PackageImpl::getLicenseText() throw (RuntimeException) +OUString BackendImpl::PackageImpl::getLicenseText() throw (RuntimeException, std::exception) { return Package::getDescription(); } @@ -177,14 +177,14 @@ BackendImpl::BackendImpl( // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > -BackendImpl::getSupportedPackageTypes() throw (RuntimeException) +BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception) { return Sequence< Reference<deployment::XPackageTypeInfo> >(&m_xTypeInfo, 1); } void BackendImpl::packageRemoved(OUString const & /*url*/, OUString const & /*mediaType*/) throw (deployment::DeploymentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { } |