diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /dbaccess/source/ui/misc | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'dbaccess/source/ui/misc')
-rw-r--r-- | dbaccess/source/ui/misc/TokenWriter.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/controllerframe.cxx | 32 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/dbaundomanager.cxx | 44 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 22 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/singledoccontroller.cxx | 4 |
5 files changed, 52 insertions, 52 deletions
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 4c593622b79e..6d4ba067d0d0 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -172,7 +172,7 @@ void ODatabaseImportExport::dispose() m_xFormatter.clear(); } -void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" ); Reference<XConnection> xCon(Source.Source,UNO_QUERY); diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 57823cdab027..bdd931bfc7ae 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -79,16 +79,16 @@ namespace dbaui ~FrameWindowActivationListener(); // XTopWindowListener - virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: void impl_checkDisposed_throw() const; @@ -284,44 +284,44 @@ namespace dbaui throw DisposedException( OUString(), *const_cast< FrameWindowActivationListener* >( this ) ); } - void SAL_CALL FrameWindowActivationListener::windowOpened( const EventObject& /*_rEvent*/ ) throw (RuntimeException) + void SAL_CALL FrameWindowActivationListener::windowOpened( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL FrameWindowActivationListener::windowClosing( const EventObject& /*_rEvent*/ ) throw (RuntimeException) + void SAL_CALL FrameWindowActivationListener::windowClosing( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL FrameWindowActivationListener::windowClosed( const EventObject& /*_rEvent*/ ) throw (RuntimeException) + void SAL_CALL FrameWindowActivationListener::windowClosed( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL FrameWindowActivationListener::windowMinimized( const EventObject& /*_rEvent*/ ) throw (RuntimeException) + void SAL_CALL FrameWindowActivationListener::windowMinimized( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL FrameWindowActivationListener::windowNormalized( const EventObject& /*_rEvent*/ ) throw (RuntimeException) + void SAL_CALL FrameWindowActivationListener::windowNormalized( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL FrameWindowActivationListener::windowActivated( const EventObject& /*_rEvent*/ ) throw (RuntimeException) + void SAL_CALL FrameWindowActivationListener::windowActivated( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception) { impl_checkDisposed_throw(); lcl_updateActive_nothrow( *m_pData, true ); } - void SAL_CALL FrameWindowActivationListener::windowDeactivated( const EventObject& /*_rEvent*/ ) throw (RuntimeException) + void SAL_CALL FrameWindowActivationListener::windowDeactivated( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception) { impl_checkDisposed_throw(); lcl_updateActive_nothrow( *m_pData, false ); } - void SAL_CALL FrameWindowActivationListener::disposing( const EventObject& /*_rEvent*/ ) throw (RuntimeException) + void SAL_CALL FrameWindowActivationListener::disposing( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception) { dispose(); } diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx index 60e063b8da57..260c57fefd26 100644 --- a/dbaccess/source/ui/misc/dbaundomanager.cxx +++ b/dbaccess/source/ui/misc/dbaundomanager.cxx @@ -197,31 +197,31 @@ namespace dbaui m_pImpl->aUndoHelper.disposing(); } - void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) + void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.enterUndoContext( i_title, aGuard ); } - void SAL_CALL UndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException) + void SAL_CALL UndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.enterHiddenUndoContext( aGuard ); } - void SAL_CALL UndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException) + void SAL_CALL UndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.leaveUndoContext( aGuard ); } - void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException) + void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.addUndoAction( i_action, aGuard ); } - void SAL_CALL UndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) + void SAL_CALL UndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; // (all our UndoActions work directly on VCL code, usually, so ...) @@ -229,7 +229,7 @@ namespace dbaui m_pImpl->aUndoHelper.undo( aGuard ); } - void SAL_CALL UndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) + void SAL_CALL UndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; // (all our UndoActions work directly on VCL code, usually, so ...) @@ -237,97 +237,97 @@ namespace dbaui m_pImpl->aUndoHelper.redo( aGuard ); } - ::sal_Bool SAL_CALL UndoManager::isUndoPossible( ) throw (RuntimeException) + ::sal_Bool SAL_CALL UndoManager::isUndoPossible( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.isUndoPossible(); } - ::sal_Bool SAL_CALL UndoManager::isRedoPossible( ) throw (RuntimeException) + ::sal_Bool SAL_CALL UndoManager::isRedoPossible( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.isRedoPossible(); } - OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getCurrentUndoActionTitle(); } - OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getCurrentRedoActionTitle(); } - Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getAllUndoActionTitles(); } - Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getAllRedoActionTitles(); } - void SAL_CALL UndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException) + void SAL_CALL UndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.clear( aGuard ); } - void SAL_CALL UndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException) + void SAL_CALL UndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.clearRedo( aGuard ); } - void SAL_CALL UndoManager::reset( ) throw (RuntimeException) + void SAL_CALL UndoManager::reset( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.reset( aGuard ); } - void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.addUndoManagerListener( i_listener ); } - void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.removeUndoManagerListener( i_listener ); } - void SAL_CALL UndoManager::lock( ) throw (RuntimeException) + void SAL_CALL UndoManager::lock( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.lock(); } - void SAL_CALL UndoManager::unlock( ) throw (NotLockedException, RuntimeException) + void SAL_CALL UndoManager::unlock( ) throw (NotLockedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.unlock(); } - ::sal_Bool SAL_CALL UndoManager::isLocked( ) throw (RuntimeException) + ::sal_Bool SAL_CALL UndoManager::isLocked( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.isLocked(); } - Reference< XInterface > SAL_CALL UndoManager::getParent( ) throw (RuntimeException) + Reference< XInterface > SAL_CALL UndoManager::getParent( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return *&m_pImpl->rParent; } - void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) + void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException, std::exception) { (void)i_parent; throw NoSupportException( OUString(), m_pImpl->getThis() ); diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index a2a549a1cba4..631a8f7fd0e5 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -209,7 +209,7 @@ namespace dbaui } } - Any SAL_CALL DBSubComponentController::queryInterface(const Type& _rType) throw (RuntimeException) + Any SAL_CALL DBSubComponentController::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) { if ( _rType.equals( cppu::UnoType<XScriptInvocationContext>::get() ) ) { @@ -221,7 +221,7 @@ namespace dbaui return DBSubComponentController_Base::queryInterface( _rType ); } - Sequence< Type > SAL_CALL DBSubComponentController::getTypes( ) throw (RuntimeException) + Sequence< Type > SAL_CALL DBSubComponentController::getTypes( ) throw (RuntimeException, std::exception) { Sequence< Type > aTypes( DBSubComponentController_Base::getTypes() ); if ( !m_pImpl->documentHasScriptSupport() ) @@ -350,7 +350,7 @@ namespace dbaui m_pImpl->m_aDataSource.clear(); } - void SAL_CALL DBSubComponentController::disposing(const EventObject& _rSource) throw( RuntimeException ) + void SAL_CALL DBSubComponentController::disposing(const EventObject& _rSource) throw( RuntimeException, std::exception ) { if ( _rSource.Source == getConnection() ) { @@ -399,7 +399,7 @@ namespace dbaui showError( m_pImpl->m_aCurrentError ); } - sal_Bool SAL_CALL DBSubComponentController::suspend(sal_Bool bSuspend) throw( RuntimeException ) + sal_Bool SAL_CALL DBSubComponentController::suspend(sal_Bool bSuspend) throw( RuntimeException, std::exception ) { m_pImpl->m_bSuspended = bSuspend; if ( !bSuspend && !isConnected() ) @@ -408,7 +408,7 @@ namespace dbaui return sal_True; } - sal_Bool SAL_CALL DBSubComponentController::attachModel( const Reference< XModel > & _rxModel) throw( RuntimeException ) + sal_Bool SAL_CALL DBSubComponentController::attachModel( const Reference< XModel > & _rxModel) throw( RuntimeException, std::exception ) { if ( !_rxModel.is() ) return sal_False; @@ -530,7 +530,7 @@ namespace dbaui } // XTitle OUString SAL_CALL DBSubComponentController::getTitle() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); if ( m_bExternalTitle ) @@ -552,7 +552,7 @@ namespace dbaui return m_pImpl->m_nDocStartNumber; } - Reference< XEmbeddedScripts > SAL_CALL DBSubComponentController::getScriptContainer() throw (RuntimeException) + Reference< XEmbeddedScripts > SAL_CALL DBSubComponentController::getScriptContainer() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); if ( !m_pImpl->documentHasScriptSupport() ) @@ -561,25 +561,25 @@ namespace dbaui return Reference< XEmbeddedScripts >( getDatabaseDocument(), UNO_QUERY_THROW ); } - void SAL_CALL DBSubComponentController::addModifyListener( const Reference< XModifyListener >& i_Listener ) throw (RuntimeException) + void SAL_CALL DBSubComponentController::addModifyListener( const Reference< XModifyListener >& i_Listener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); m_pImpl->m_aModifyListeners.addInterface( i_Listener ); } - void SAL_CALL DBSubComponentController::removeModifyListener( const Reference< XModifyListener >& i_Listener ) throw (RuntimeException) + void SAL_CALL DBSubComponentController::removeModifyListener( const Reference< XModifyListener >& i_Listener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); m_pImpl->m_aModifyListeners.removeInterface( i_Listener ); } - ::sal_Bool SAL_CALL DBSubComponentController::isModified( ) throw (RuntimeException) + ::sal_Bool SAL_CALL DBSubComponentController::isModified( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); return impl_isModified(); } - void SAL_CALL DBSubComponentController::setModified( ::sal_Bool i_bModified ) throw (PropertyVetoException, RuntimeException) + void SAL_CALL DBSubComponentController::setModified( ::sal_Bool i_bModified ) throw (PropertyVetoException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( getMutex() ); diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index de9d549badef..ee8973331bf4 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -78,7 +78,7 @@ namespace dbaui m_pData->m_pUndoManager->disposing(); } - void SAL_CALL OSingleDocumentController::disposing( const EventObject& i_event ) throw( RuntimeException ) + void SAL_CALL OSingleDocumentController::disposing( const EventObject& i_event ) throw( RuntimeException, std::exception ) { // simply disambiguate OSingleDocumentController_Base::disposing( i_event ); @@ -107,7 +107,7 @@ namespace dbaui InvalidateFeature( ID_BROWSER_REDO ); } - Reference< XUndoManager > SAL_CALL OSingleDocumentController::getUndoManager( ) throw (RuntimeException) + Reference< XUndoManager > SAL_CALL OSingleDocumentController::getUndoManager( ) throw (RuntimeException, std::exception) { return m_pData->m_pUndoManager.get(); } |