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 /extensions/source/update/feed/updatefeed.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 'extensions/source/update/feed/updatefeed.cxx')
-rw-r--r-- | extensions/source/update/feed/updatefeed.cxx | 57 |
1 files changed, 22 insertions, 35 deletions
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 38c434608312..9323b095b191 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -117,10 +117,8 @@ class ActiveDataSink : public ::cppu::WeakImplHelper< io::XActiveDataSink > public: ActiveDataSink() {}; - virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() - throw (uno::RuntimeException, std::exception) override { return m_xStream; }; - virtual void SAL_CALL setInputStream( uno::Reference< io::XInputStream > const & rStream ) - throw (uno::RuntimeException, std::exception) override { m_xStream = rStream; }; + virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() override { return m_xStream; }; + virtual void SAL_CALL setInputStream( uno::Reference< io::XInputStream > const & rStream ) override { m_xStream = rStream; }; }; @@ -146,40 +144,32 @@ public: getUpdateInformation( uno::Sequence< OUString > const & repositories, OUString const & extensionId - ) throw (uno::Exception, uno::RuntimeException, std::exception) override; + ) override; - virtual void SAL_CALL cancel() - throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() override; virtual void SAL_CALL setInteractionHandler( - uno::Reference< task::XInteractionHandler > const & handler ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference< task::XInteractionHandler > const & handler ) override; virtual uno::Reference< container::XEnumeration > SAL_CALL getUpdateInformationEnumeration( uno::Sequence< OUString > const & repositories, OUString const & extensionId - ) throw (uno::Exception, uno::RuntimeException, std::exception) override; + ) override; // XCommandEnvironment - virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw ( uno::RuntimeException, std::exception ) override; + virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() override; - virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler() - throw ( uno::RuntimeException, std::exception ) override { return uno::Reference< ucb::XProgressHandler >(); }; + virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler() override { return uno::Reference< ucb::XProgressHandler >(); }; // XWebDAVCommandEnvironment virtual uno::Sequence< beans::StringPair > SAL_CALL getUserRequestHeaders( - const OUString&, ucb::WebDAVHTTPMethod ) - throw ( uno::RuntimeException, std::exception ) override; + const OUString&, ucb::WebDAVHTTPMethod ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: @@ -230,8 +220,8 @@ public: }; // XEnumeration - sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) override { return m_nCount < m_nNodes; }; - uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL hasMoreElements() override { return m_nCount < m_nNodes; }; + uno::Any SAL_CALL nextElement() override { OSL_ASSERT( m_xNodeList.is() ); OSL_ASSERT( m_xUpdateInformationProvider.is() ); @@ -288,8 +278,8 @@ public: : m_nCount(0) { m_aEntry.UpdateDocument = xElement; }; // XEnumeration - sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) override { return 0 == m_nCount; }; - uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL hasMoreElements() override { return 0 == m_nCount; }; + uno::Any SAL_CALL nextElement() override { if( m_nCount > 0 ) throw container::NoSuchElementException(OUString::number(m_nCount), *this); @@ -385,7 +375,6 @@ OUString UpdateInformationProvider::getUserAgent(bool bExtended) uno::Sequence< beans::StringPair > SAL_CALL UpdateInformationProvider::getUserRequestHeaders( const OUString &aURL, ucb::WebDAVHTTPMethod ) - throw ( uno::RuntimeException, std::exception ) { bool bExtendedUserAgent; uno::Sequence< beans::StringPair > aPair = m_aRequestHeaderList; @@ -585,7 +574,7 @@ uno::Reference< container::XEnumeration > SAL_CALL UpdateInformationProvider::getUpdateInformationEnumeration( uno::Sequence< OUString > const & repositories, OUString const & extensionId -) throw (uno::Exception, uno::RuntimeException, std::exception) +) { OSL_ASSERT(m_xDocumentBuilder.is()); @@ -655,7 +644,7 @@ uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL UpdateInformationProvider::getUpdateInformation( uno::Sequence< OUString > const & repositories, OUString const & extensionId -) throw (uno::Exception, uno::RuntimeException, std::exception) +) { uno::Reference< container::XEnumeration > xEnumeration( getUpdateInformationEnumeration(repositories, extensionId) @@ -694,7 +683,7 @@ UpdateInformationProvider::getUpdateInformation( void SAL_CALL -UpdateInformationProvider::cancel() throw (uno::RuntimeException, std::exception) +UpdateInformationProvider::cancel() { m_bCancelled.set(); @@ -707,7 +696,6 @@ UpdateInformationProvider::cancel() throw (uno::RuntimeException, std::exception void SAL_CALL UpdateInformationProvider::setInteractionHandler( uno::Reference< task::XInteractionHandler > const & handler ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); m_xInteractionHandler = handler; @@ -716,7 +704,6 @@ UpdateInformationProvider::setInteractionHandler( uno::Reference< task::XInteractionHandler > SAL_CALL UpdateInformationProvider::getInteractionHandler() - throw ( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -762,20 +749,20 @@ UpdateInformationProvider::getImplName() OUString SAL_CALL -UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException, std::exception) +UpdateInformationProvider::getImplementationName() { return getImplName(); } uno::Sequence< OUString > SAL_CALL -UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +UpdateInformationProvider::getSupportedServiceNames() { return getServiceNames(); } sal_Bool SAL_CALL -UpdateInformationProvider::supportsService( OUString const & serviceName ) throw (uno::RuntimeException, std::exception) +UpdateInformationProvider::supportsService( OUString const & serviceName ) { return cppu::supportsService(this, serviceName); } |