diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /svtools/source/uno/popupmenucontrollerbase.cxx | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svtools/source/uno/popupmenucontrollerbase.cxx')
-rw-r--r-- | svtools/source/uno/popupmenucontrollerbase.cxx | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 1c0f3431f8f7..225aa304d2b5 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -67,7 +67,7 @@ PopupMenuControllerBase::~PopupMenuControllerBase() } // protected function -void PopupMenuControllerBase::throwIfDisposed() throw ( RuntimeException ) +void PopupMenuControllerBase::throwIfDisposed() { if (rBHelper.bDisposed || rBHelper.bInDispose) throw css::lang::DisposedException(); @@ -92,13 +92,13 @@ void SAL_CALL PopupMenuControllerBase::disposing() } // XServiceInfo -sal_Bool SAL_CALL PopupMenuControllerBase::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL PopupMenuControllerBase::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } // XEventListener -void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) +void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) { osl::MutexGuard aLock( m_aMutex ); m_xFrame.clear(); @@ -107,11 +107,11 @@ void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) throw ( R } // XMenuListener -void SAL_CALL PopupMenuControllerBase::itemHighlighted( const awt::MenuEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL PopupMenuControllerBase::itemHighlighted( const awt::MenuEvent& ) { } -void SAL_CALL PopupMenuControllerBase::itemSelected( const awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL PopupMenuControllerBase::itemSelected( const awt::MenuEvent& rEvent ) { throwIfDisposed(); @@ -157,15 +157,15 @@ IMPL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, void*, p, void ) delete pDispatchInfo; } -void SAL_CALL PopupMenuControllerBase::itemActivated( const awt::MenuEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL PopupMenuControllerBase::itemActivated( const awt::MenuEvent& ) { } -void SAL_CALL PopupMenuControllerBase::itemDeactivated( const awt::MenuEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL PopupMenuControllerBase::itemDeactivated( const awt::MenuEvent& ) { } -void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL PopupMenuControllerBase::updatePopupMenu() { osl::ClearableMutexGuard aLock( m_aMutex ); throwIfDisposed(); @@ -199,7 +199,6 @@ PopupMenuControllerBase::queryDispatch( const URL& /*aURL*/, const OUString& /*sTarget*/, sal_Int32 /*nFlags*/ ) -throw( RuntimeException, std::exception ) { // must be implemented by subclass osl::MutexGuard aLock( m_aMutex ); @@ -208,7 +207,7 @@ throw( RuntimeException, std::exception ) return Reference< XDispatch >(); } -Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispatches( const Sequence< DispatchDescriptor >& lDescriptor ) throw( RuntimeException, std::exception ) +Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispatches( const Sequence< DispatchDescriptor >& lDescriptor ) { // Create return list - which must have same size then the given descriptor // It's not allowed to pack it! @@ -235,7 +234,6 @@ void SAL_CALL PopupMenuControllerBase::dispatch( const URL& /*aURL*/, const Sequence< PropertyValue >& /*seqProperties*/ ) -throw( css::uno::RuntimeException, std::exception ) { // must be implemented by subclass osl::MutexGuard aLock( m_aMutex ); @@ -246,7 +244,6 @@ void SAL_CALL PopupMenuControllerBase::addStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) -throw( css::uno::RuntimeException, std::exception ) { osl::ResettableMutexGuard aLock( m_aMutex ); throwIfDisposed(); @@ -275,7 +272,6 @@ throw( css::uno::RuntimeException, std::exception ) void SAL_CALL PopupMenuControllerBase::removeStatusListener( const Reference< XStatusListener >& xControl, const URL& /*aURL*/ ) -throw( css::uno::RuntimeException, std::exception ) { rBHelper.removeListener( cppu::UnoType<decltype(xControl)>::get(), xControl ); } @@ -302,7 +298,7 @@ OUString PopupMenuControllerBase::determineBaseURL( const OUString& aURL ) } // XInitialization -void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) +void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments ) { osl::MutexGuard aLock( m_aMutex ); @@ -336,7 +332,7 @@ void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArgum } } // XPopupMenuController -void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception ) +void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopupMenu >& xPopupMenu ) { osl::MutexGuard aLock( m_aMutex ); throwIfDisposed(); |