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 /ucb/source/ucp/ext | |
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 'ucb/source/ucp/ext')
-rw-r--r-- | ucb/source/ucp/ext/ucpext_content.cxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/ext/ucpext_content.hxx | 16 | ||||
-rw-r--r-- | ucb/source/ucp/ext/ucpext_datasupplier.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ext/ucpext_datasupplier.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ext/ucpext_provider.cxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/ext/ucpext_provider.hxx | 10 |
6 files changed, 20 insertions, 28 deletions
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index e7f52419935b..85a008dee62b 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -160,13 +160,13 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL Content::getImplementationName() throw( RuntimeException, std::exception ) + OUString SAL_CALL Content::getImplementationName() { return OUString( "org.openoffice.comp.ucp.ext.Content" ); } - Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException, std::exception ) + Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() { Sequence< OUString > aServiceNames(2); aServiceNames[0] = "com.sun.star.ucb.Content"; @@ -175,7 +175,7 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL Content::getContentType() throw( RuntimeException, std::exception ) + OUString SAL_CALL Content::getContentType() { impl_determineContentType(); return *m_aContentType; @@ -183,7 +183,6 @@ namespace ucb { namespace ucp { namespace ext Any SAL_CALL Content::execute( const Command& aCommand, sal_Int32 /* CommandId */, const Reference< XCommandEnvironment >& i_rEvironment ) - throw( Exception, CommandAbortedException, RuntimeException, std::exception ) { Any aRet; @@ -274,7 +273,7 @@ namespace ucb { namespace ucp { namespace ext } - void SAL_CALL Content::abort( sal_Int32 ) throw( RuntimeException, std::exception ) + void SAL_CALL Content::abort( sal_Int32 ) { } diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index c01a330e1f1b..89c8498d36d8 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -89,11 +89,11 @@ namespace ucb { namespace ucp { namespace ext virtual ~Content() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) 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 css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XContent - virtual OUString SAL_CALL getContentType() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getContentType() override; // XCommandProcessor virtual css::uno::Any SAL_CALL @@ -101,18 +101,12 @@ namespace ucb { namespace ucp { namespace ext const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment - ) - throw ( css::uno::Exception - , css::ucb::CommandAbortedException - , css::uno::RuntimeException, std::exception - ) override; + ) override; virtual void SAL_CALL abort( sal_Int32 CommandId - ) - throw ( css::uno::RuntimeException, std::exception - ) override; + ) override; private: virtual css::uno::Sequence< css::beans::Property > getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment >& i_rEnv ) override; diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index ca437c51b2b5..1f8f0eb4af5d 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -337,7 +337,7 @@ namespace ucb { namespace ucp { namespace ext } - void DataSupplier::validate() throw( ResultSetException ) + void DataSupplier::validate() { } diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index b9a7fccb2d11..fe7effa5640f 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -65,7 +65,7 @@ namespace ucb { namespace ucp { namespace ext virtual void close() override; - virtual void validate() throw( css::ucb::ResultSetException ) override; + virtual void validate() override; private: std::unique_ptr< DataSupplier_Impl > m_pImpl; diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 6da0f7fb8f5b..0d955baebda7 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -54,19 +54,19 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException) + OUString SAL_CALL ContentProvider::getImplementationName_static() { return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); } - OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException, std::exception) + OUString SAL_CALL ContentProvider::getImplementationName() { return getImplementationName_static(); } - Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) { Sequence< OUString > aServiceNames(2); aServiceNames[0] = "com.sun.star.ucb.ContentProvider"; @@ -75,7 +75,7 @@ namespace ucb { namespace ucp { namespace ext } - Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) { return getSupportedServiceNames_static(); } @@ -112,7 +112,6 @@ namespace ucb { namespace ucp { namespace ext Reference< XContent > SAL_CALL ContentProvider::queryContent( const Reference< XContentIdentifier >& i_rIdentifier ) - throw( IllegalIdentifierException, RuntimeException, std::exception ) { // Check URL scheme... const OUString sScheme( "vnd.sun.star.extension" ); diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index af8d00c4f5fc..e69f827b33aa 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -37,18 +37,18 @@ namespace ucb { namespace ucp { namespace ext virtual ~ContentProvider() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) 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 css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& i_rContext ); // XContentProvider - virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) throw (css::ucb::IllegalIdentifierException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; public: static OUString getRootURL(); |