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/services/autorecovery.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/services/autorecovery.cxx')
-rw-r--r-- | framework/source/services/autorecovery.cxx | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index cd74f30d07f0..a29ef9a37eba 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -439,20 +439,17 @@ public: explicit AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~AutoRecovery( ) override; - 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.AutoRecovery"); } - 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.AutoRecovery"}; } @@ -462,26 +459,23 @@ public: { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () override { OWeakObject::release(); } - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override; /// Initialization function after having acquire()'d. void initListeners(); // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // css.frame.XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& lArguments) override; virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, - const css::util::URL& aURL ) - throw(css::uno::RuntimeException, std::exception) override; + const css::util::URL& aURL ) override; virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, - const css::util::URL& aURL ) - throw(css::uno::RuntimeException, std::exception) override; + const css::util::URL& aURL ) override; // css.document.XDocumentEventListener /** @short informs about created/opened documents. @@ -493,20 +487,16 @@ public: @param aEvent points to the new created/opened document. */ - 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; // css.util.XChangesListener - virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override; // css.util.XModifyListener - virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) override; // 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; protected: @@ -515,20 +505,17 @@ protected: virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue, css::uno::Any& aOldValue , sal_Int32 nHandle , - const css::uno::Any& aValue ) - throw(css::lang::IllegalArgumentException) override; + const css::uno::Any& aValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& aValue ) - throw(css::uno::Exception, std::exception) override; + const css::uno::Any& aValue ) override; using cppu::OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue(css::uno::Any& aValue , sal_Int32 nHandle) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; private: virtual void SAL_CALL disposing() final override; @@ -1268,7 +1255,7 @@ void AutoRecovery::disposing() implts_stopTimer(); } -Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) +Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) { Any aRet = AutoRecovery_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -1276,7 +1263,7 @@ Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw( return aRet; } -Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::RuntimeException, std::exception) +Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) { return comphelper::concatSequences( AutoRecovery_BASE::getTypes(), @@ -1286,7 +1273,6 @@ Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::R void SAL_CALL AutoRecovery::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk.autorecovery", "AutoRecovery::dispatch() starts ..." << aURL.Complete); @@ -1520,7 +1506,6 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw(css::uno::RuntimeException, std::exception) { if (!xListener.is()) throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this)); @@ -1553,7 +1538,6 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw(css::uno::RuntimeException, std::exception) { if (!xListener.is()) throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this)); @@ -1562,7 +1546,6 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css: } void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEvent& aEvent) - throw(css::uno::RuntimeException, std::exception) { css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY); @@ -1630,7 +1613,6 @@ void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEv } void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException, std::exception) { const css::uno::Sequence< css::util::ElementChange > lChanges (aEvent.Changes); const css::util::ElementChange* pChanges = lChanges.getConstArray(); @@ -1683,7 +1665,6 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven } void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) { css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY); if (! xDocument.is()) @@ -1693,7 +1674,6 @@ void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent) } void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) { /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -3977,7 +3957,6 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /* css::uno::Any& /*aOldValue*/ , sal_Int32 /*nHandle*/ , const css::uno::Any& /*aValue*/ ) - throw(css::lang::IllegalArgumentException) { // not needed currently return false; @@ -3985,7 +3964,6 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /* void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const css::uno::Any& /*aValue*/ ) - throw(css::uno::Exception, std::exception) { // not needed currently } @@ -4065,7 +4043,6 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto } css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) { static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = nullptr; if(!pInfo) |