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 /framework/source/uielement/controlmenucontroller.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 'framework/source/uielement/controlmenucontroller.cxx')
-rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index c90926447e25..0cd54b70c70b 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -137,38 +137,35 @@ public: explicit ControlMenuController( const uno::Reference< uno::XComponentContext >& xContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.comp.framework.ControlMenuController"); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return {"com.sun.star.frame.PopupMenuController"}; } // XPopupMenuController - virtual void SAL_CALL updatePopupMenu() throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updatePopupMenu() override; // XInitialization - virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) override; // XMenuListener - virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) override; // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const lang::EventObject& Source ) override; private: virtual void impl_setPopupMenu() override; @@ -232,7 +229,7 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP } // XEventListener -void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) +void SAL_CALL ControlMenuController::disposing( const EventObject& ) { Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY ); @@ -247,7 +244,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run } // XStatusListener -void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) +void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) { osl::ResettableMutexGuard aLock( m_aMutex ); @@ -301,7 +298,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve } // XMenuListener -void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) { osl::ResettableMutexGuard aLock( m_aMutex ); @@ -348,7 +345,7 @@ void ControlMenuController::impl_setPopupMenu() } // if ( m_pResPopupMenu == 0 ) } -void SAL_CALL ControlMenuController::updatePopupMenu() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ControlMenuController::updatePopupMenu() { osl::ResettableMutexGuard aLock( m_aMutex ); @@ -378,7 +375,7 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (css::uno::RuntimeE } // XInitialization -void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) +void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) { osl::ResettableMutexGuard aLock( m_aMutex ); svt::PopupMenuControllerBase::initialize(aArguments); |