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 /svtools/source/hatchwindow | |
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 'svtools/source/hatchwindow')
-rw-r--r-- | svtools/source/hatchwindow/documentcloser.cxx | 18 | ||||
-rw-r--r-- | svtools/source/hatchwindow/hatchwindow.cxx | 11 | ||||
-rw-r--r-- | svtools/source/hatchwindow/hatchwindowfactory.cxx | 12 |
3 files changed, 12 insertions, 29 deletions
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index aafcd7fa437b..eb51dfb8b8ac 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -58,14 +58,14 @@ public: virtual ~ODocumentCloser() override; // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; class MainThreadFrameCloserRequest @@ -177,7 +177,6 @@ ODocumentCloser::~ODocumentCloser() // XComponent void SAL_CALL ODocumentCloser::dispose() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -201,7 +200,6 @@ void SAL_CALL ODocumentCloser::dispose() void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bDisposed ) @@ -215,7 +213,6 @@ void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEv void SAL_CALL ODocumentCloser::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pListenersContainer ) @@ -224,19 +221,16 @@ void SAL_CALL ODocumentCloser::removeEventListener( const uno::Reference< lang:: // XServiceInfo OUString SAL_CALL ODocumentCloser::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.comp.embed.DocumentCloser" ); } sal_Bool SAL_CALL ODocumentCloser::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { const OUString aServiceName( "com.sun.star.embed.DocumentCloser" ); return uno::Sequence< OUString >( &aServiceName, 1 ); diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx index e7216d25f256..8e0faf1f4994 100644 --- a/svtools/source/hatchwindow/hatchwindow.cxx +++ b/svtools/source/hatchwindow/hatchwindow.cxx @@ -109,7 +109,6 @@ void VCLXHatchWindow::InplaceDeactivate() uno::Any SAL_CALL VCLXHatchWindow::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -138,7 +137,6 @@ void SAL_CALL VCLXHatchWindow::release() } uno::Sequence< uno::Type > SAL_CALL VCLXHatchWindow::getTypes() - throw( uno::RuntimeException, std::exception ) { static ::cppu::OTypeCollection* pTypeCollection = nullptr ; @@ -160,17 +158,16 @@ uno::Sequence< uno::Type > SAL_CALL VCLXHatchWindow::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL VCLXHatchWindow::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } -css::awt::Size SAL_CALL VCLXHatchWindow::getHatchBorderSize() throw (css::uno::RuntimeException, std::exception) +css::awt::Size SAL_CALL VCLXHatchWindow::getHatchBorderSize() { return aHatchBorderSize; } -void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const css::awt::Size& _hatchbordersize ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const css::awt::Size& _hatchbordersize ) { if ( pHatchWindow ) { @@ -180,26 +177,22 @@ void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const css::awt::Size& _hatchb } void SAL_CALL VCLXHatchWindow::setController( const uno::Reference< embed::XHatchWindowController >& xController ) - throw (uno::RuntimeException, std::exception) { m_xController = xController; } void SAL_CALL VCLXHatchWindow::dispose() - throw (uno::RuntimeException, std::exception) { pHatchWindow.clear(); VCLXWindow::dispose(); } void SAL_CALL VCLXHatchWindow::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { VCLXWindow::addEventListener( xListener ); } void SAL_CALL VCLXHatchWindow::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { VCLXWindow::removeEventListener( xListener ); } diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index f25c806cae9e..8aee772ca732 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -39,19 +39,18 @@ public: OHatchWindowFactory() {} // XHatchWindowFactory - virtual uno::Reference< embed::XHatchWindow > SAL_CALL createHatchWindowInstance( const uno::Reference< awt::XWindowPeer >& xParent, const awt::Rectangle& aBounds, const awt::Size& aSize ) throw (uno::RuntimeException, std::exception) override; + virtual uno::Reference< embed::XHatchWindow > SAL_CALL createHatchWindowInstance( const uno::Reference< awt::XWindowPeer >& xParent, const awt::Rectangle& aBounds, const awt::Size& aSize ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& 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( const OUString& ServiceName ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchWindowInstance( const uno::Reference< awt::XWindowPeer >& xParent, const awt::Rectangle& aBounds, const awt::Size& aHandlerSize ) - throw (uno::RuntimeException, std::exception) { if ( !xParent.is() ) throw lang::IllegalArgumentException(); // TODO @@ -63,19 +62,16 @@ uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchW } OUString SAL_CALL OHatchWindowFactory::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); } sal_Bool SAL_CALL OHatchWindowFactory::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.HatchWindowFactory"; |