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 /include/framework | |
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 'include/framework')
-rw-r--r-- | include/framework/dispatchhelper.hxx | 20 | ||||
-rw-r--r-- | include/framework/menuconfiguration.hxx | 6 | ||||
-rw-r--r-- | include/framework/preventduplicateinteraction.hxx | 9 | ||||
-rw-r--r-- | include/framework/titlehelper.hxx | 24 |
4 files changed, 21 insertions, 38 deletions
diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx index df8ff3bfa8d8..c4f58b5a2976 100644 --- a/include/framework/dispatchhelper.hxx +++ b/include/framework/dispatchhelper.hxx @@ -73,9 +73,9 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X virtual ~DispatchHelper( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName ( ) override; + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) override; static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); static OUString SAL_CALL impl_getStaticImplementationName ( ); @@ -84,7 +84,7 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X // Helper for registry /// @throws css::uno::Exception - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); @@ -94,8 +94,7 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X const OUString& sURL , const OUString& sTargetFrameName , sal_Int32 nSearchFlags , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override; // not a public XDispatchHelper-method, need in sfx2/source/control/statcach.cxx for extensions /// @throws css::uno::RuntimeException @@ -103,19 +102,16 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X const css::uno::Reference< css::frame::XDispatch >& xDispatch , const css::util::URL& aURL , bool SyncronFlag , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw(css::uno::RuntimeException); + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ); // XDispatchResultListener virtual void SAL_CALL dispatchFinished( - const css::frame::DispatchResultEvent& aResult ) - throw(css::uno::RuntimeException, std::exception) override; + const css::frame::DispatchResultEvent& aResult ) override; // XEventListener virtual void SAL_CALL disposing( - const css::lang::EventObject& aEvent ) - throw(css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; }; } diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx index 94de3ec59397..15cb3c768fe0 100644 --- a/include/framework/menuconfiguration.hxx +++ b/include/framework/menuconfiguration.hxx @@ -106,16 +106,14 @@ public: /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException css::uno::Reference< css::container::XIndexAccess > CreateMenuBarConfigurationFromXML( - css::uno::Reference< css::io::XInputStream >& rInputStream ) - throw (css::lang::WrappedTargetException, css::uno::RuntimeException); + css::uno::Reference< css::io::XInputStream >& rInputStream ); /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException void StoreMenuBarConfigurationToXML( css::uno::Reference< css::container::XIndexAccess >& rMenuBarConfiguration, css::uno::Reference< css::io::XOutputStream >& rOutputStream, - bool bIsMenuBar ) - throw (css::lang::WrappedTargetException, css::uno::RuntimeException); + bool bIsMenuBar ); private: css::uno::Reference< css::uno::XComponentContext> m_xContext; diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx index 33ed071cdd3c..ae5bafaaf28a 100644 --- a/include/framework/preventduplicateinteraction.hxx +++ b/include/framework/preventduplicateinteraction.hxx @@ -121,8 +121,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @threadsafe yes */ - virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) override; /** @@ -135,8 +134,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @threadsafe yes */ - virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) override; /** @@ -146,8 +144,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @threadsafe yes */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; // c++ interface public: diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index 5fe23b7d46d9..d2dd61b8c4f8 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -101,43 +101,35 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex /** @see XTitle */ - virtual OUString SAL_CALL getTitle() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle() override; /** @see XTitle */ - virtual void SAL_CALL setTitle(const OUString& sTitle) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle(const OUString& sTitle) override; /** @see XTitleChangeBroadcaster */ - virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) override; /** @see XTitleChangeBroadcaster */ - virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) override; /** @see XTitleChangeListener */ - virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) override; /** @see css.document.XDocumentEventListener */ - virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent) override; /** @see css.lang.XEventListener */ - virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override; /** @see css.frame.XFrameActionListener */ - virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) override; // internal |