diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-04-30 08:20:03 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2021-05-02 17:02:28 +0200 |
commit | 10d29c390dd58ed629dd27fe5ed35fae28eceec3 (patch) | |
tree | 7476cbb90fff182c5bec0a5a1ef9c41a3ad29f19 /include/toolkit | |
parent | a9243e626193ab4efe3a618413886773336a38e6 (diff) |
throw() -> noexcept, part 2/3: Automatic loplugin:noexcept rewrite
Change-Id: I076f16d0536b534abf0ced4d76051eadb4c0e033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114949
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/toolkit')
-rw-r--r-- | include/toolkit/awt/vclxmenu.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/awt/vclxwindows.hxx | 24 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrolmodel.hxx | 6 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrols.hxx | 40 | ||||
-rw-r--r-- | include/toolkit/helper/listenermultiplexer.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/helper/macros.hxx | 12 |
6 files changed, 45 insertions, 45 deletions
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 5232ee699efa..73e8e3acb451 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -84,8 +84,8 @@ public: // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakObject::release(); } // css::lang::XUnoTunnel UNO3_GETIMPLEMENTATION_DECL(VCLXMenu) diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index c3e71d97900d..38c3a1a4a268 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -146,8 +146,8 @@ public: // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -204,8 +204,8 @@ public: // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -259,8 +259,8 @@ public: // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakObject::release(); } // css::lang::XComponent void SAL_CALL dispose( ) override; @@ -306,8 +306,8 @@ public: // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -344,8 +344,8 @@ public: VCLXScrollBar(); // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -414,8 +414,8 @@ public: // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index 9f82bb9e4a79..fb22dc3e4383 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -124,14 +124,14 @@ public: // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return OWeakAggObject::queryInterface(rType); } - void SAL_CALL acquire() throw() override; - void SAL_CALL release() throw() override; + void SAL_CALL acquire() noexcept override; + void SAL_CALL release() noexcept override; // css::uno::XAggregation css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; // css::lang::XUnoTunnel - static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() throw(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() noexcept; sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override; // css::util::XCloneable diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index eb75d36b6e97..06b127b32f80 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -577,8 +577,8 @@ public: css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoControlBase::queryInterface(rType); } css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() override { OWeakAggObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakAggObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakAggObject::release(); } void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override; void SAL_CALL dispose( ) override; @@ -646,8 +646,8 @@ public: css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoControlBase::queryInterface(rType); } css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() override { OWeakAggObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakAggObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakAggObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -944,8 +944,8 @@ public: css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoEditControl::queryInterface(rType); } css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() override { OWeakAggObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakAggObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakAggObject::release(); } // css::lang::XTypeProvider @@ -1002,8 +1002,8 @@ public: css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoEditControl::queryInterface(rType); } css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() override { OWeakAggObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakAggObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakAggObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -1065,8 +1065,8 @@ public: css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoSpinFieldControl::queryInterface(rType); } css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() override { OWeakAggObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakAggObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakAggObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -1141,8 +1141,8 @@ public: css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoSpinFieldControl::queryInterface(rType); } css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() override { OWeakAggObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakAggObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakAggObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -1215,8 +1215,8 @@ public: css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoSpinFieldControl::queryInterface(rType); } css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() override { OWeakAggObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakAggObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakAggObject::release(); } void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override; @@ -1291,8 +1291,8 @@ public: css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoSpinFieldControl::queryInterface(rType); } css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() override { OWeakAggObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakAggObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakAggObject::release(); } void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override; @@ -1365,8 +1365,8 @@ public: css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoSpinFieldControl::queryInterface(rType); } css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() override { OWeakAggObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakAggObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakAggObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -1422,8 +1422,8 @@ public: css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoControlBase::queryInterface(rType); } css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() override { OWeakAggObject::release(); } + void SAL_CALL acquire() noexcept override { OWeakAggObject::acquire(); } + void SAL_CALL release() noexcept override { OWeakAggObject::release(); } // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index a837aeb83de3..d1fb0215f6c9 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -68,8 +68,8 @@ public: // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { mrContext.acquire(); } - void SAL_CALL release() throw() override { mrContext.release(); } + void SAL_CALL acquire() noexcept override { mrContext.acquire(); } + void SAL_CALL release() noexcept override { mrContext.release(); } }; diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 1bfd46b1bd7e..cd121bc0998d 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -37,8 +37,8 @@ class ClassName final : public ListenerMultiplexerBase, public InterfaceName \ public: \ ClassName( ::cppu::OWeakObject& rSource ); \ css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; \ - void SAL_CALL acquire() throw() override; \ - void SAL_CALL release() throw() override; \ + void SAL_CALL acquire() noexcept override; \ + void SAL_CALL release() noexcept override; \ void SAL_CALL disposing( const css::lang::EventObject& Source ) override; @@ -48,8 +48,8 @@ class TOOLKIT_DLLPUBLIC ClassName final : public ListenerMultiplexerBase, public public: \ ClassName( ::cppu::OWeakObject& rSource ); \ css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; \ - void SAL_CALL acquire() throw() override; \ - void SAL_CALL release() throw() override; \ + void SAL_CALL acquire() noexcept override; \ + void SAL_CALL release() noexcept override; \ void SAL_CALL disposing( const css::lang::EventObject& Source ) override; @@ -62,8 +62,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ : ListenerMultiplexerBase( rSource ) \ { \ } \ -void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \ -void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \ +void SAL_CALL ClassName::acquire() noexcept { ListenerMultiplexerBase::acquire(); } \ +void SAL_CALL ClassName::release() noexcept { ListenerMultiplexerBase::release(); } \ css::uno::Any ClassName::queryInterface( const css::uno::Type & rType ) \ { \ css::uno::Any aRet = ::cppu::queryInterface( rType, \ |