From 10d29c390dd58ed629dd27fe5ed35fae28eceec3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 30 Apr 2021 08:20:03 +0200 Subject: 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 --- framework/source/fwe/classes/actiontriggercontainer.cxx | 4 ++-- framework/source/fwe/classes/actiontriggerpropertyset.cxx | 4 ++-- framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 4 ++-- framework/source/fwe/classes/rootactiontriggercontainer.cxx | 4 ++-- framework/source/fwe/helper/propertysetcontainer.cxx | 4 ++-- framework/source/fwi/uielement/constitemcontainer.cxx | 2 +- framework/source/fwi/uielement/itemcontainer.cxx | 2 +- framework/source/fwi/uielement/rootitemcontainer.cxx | 2 +- framework/source/layoutmanager/toolbarlayoutmanager.cxx | 4 ++-- framework/source/layoutmanager/toolbarlayoutmanager.hxx | 4 ++-- framework/source/services/autorecovery.cxx | 4 ++-- framework/source/services/pathsettings.cxx | 4 ++-- framework/source/uielement/buttontoolbarcontroller.cxx | 4 ++-- framework/source/uielement/menubarwrapper.cxx | 4 ++-- framework/source/uielement/toolbarwrapper.cxx | 4 ++-- 15 files changed, 27 insertions(+), 27 deletions(-) (limited to 'framework/source') diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index 331eb5cb935e..c21dbcbbd94d 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -58,12 +58,12 @@ Any SAL_CALL ActionTriggerContainer::queryInterface( const Type& aType ) return PropertySetContainer::queryInterface( aType ); } -void ActionTriggerContainer::acquire() throw() +void ActionTriggerContainer::acquire() noexcept { PropertySetContainer::acquire(); } -void ActionTriggerContainer::release() throw() +void ActionTriggerContainer::release() noexcept { PropertySetContainer::release(); } diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 128f5815bb1a..404e7f00a6bf 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -87,12 +87,12 @@ Any SAL_CALL ActionTriggerPropertySet::queryInterface( const Type& aType ) return OWeakObject::queryInterface( aType ); } -void SAL_CALL ActionTriggerPropertySet::acquire() throw () +void SAL_CALL ActionTriggerPropertySet::acquire() noexcept { OWeakObject::acquire(); } -void SAL_CALL ActionTriggerPropertySet::release() throw () +void SAL_CALL ActionTriggerPropertySet::release() noexcept { OWeakObject::release(); } diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index eb9d6d2ec71f..4d090384194c 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -82,12 +82,12 @@ Any SAL_CALL ActionTriggerSeparatorPropertySet::queryInterface( const Type& aTyp return OWeakObject::queryInterface( aType ); } -void ActionTriggerSeparatorPropertySet::acquire() throw() +void ActionTriggerSeparatorPropertySet::acquire() noexcept { OWeakObject::acquire(); } -void ActionTriggerSeparatorPropertySet::release() throw() +void ActionTriggerSeparatorPropertySet::release() noexcept { OWeakObject::release(); } diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 4181011db25a..8a59027aae1b 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -74,12 +74,12 @@ Any SAL_CALL RootActionTriggerContainer::queryInterface( const Type& aType ) return PropertySetContainer::queryInterface( aType ); } -void SAL_CALL RootActionTriggerContainer::acquire() throw () +void SAL_CALL RootActionTriggerContainer::acquire() noexcept { PropertySetContainer::acquire(); } -void SAL_CALL RootActionTriggerContainer::release() throw () +void SAL_CALL RootActionTriggerContainer::release() noexcept { PropertySetContainer::release(); } diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx index 5d129d36b01a..e2c304ce4808 100644 --- a/framework/source/fwe/helper/propertysetcontainer.cxx +++ b/framework/source/fwe/helper/propertysetcontainer.cxx @@ -45,12 +45,12 @@ PropertySetContainer::~PropertySetContainer() } // XInterface -void SAL_CALL PropertySetContainer::acquire() throw () +void SAL_CALL PropertySetContainer::acquire() noexcept { OWeakObject::acquire(); } -void SAL_CALL PropertySetContainer::release() throw () +void SAL_CALL PropertySetContainer::release() noexcept { OWeakObject::release(); } diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 4aaaefc5d158..a137a5f8c6b1 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -169,7 +169,7 @@ sal_Int64 ConstItemContainer::getSomething( const css::uno::Sequence< sal_Int8 > return 0; } -const Sequence< sal_Int8 >& ConstItemContainer::getUnoTunnelId() throw() +const Sequence< sal_Int8 >& ConstItemContainer::getUnoTunnelId() noexcept { static const UnoTunnelIdInit theConstItemContainerUnoTunnelId; return theConstItemContainerUnoTunnelId.getSeq(); diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index 131ddf1a7cbe..b30791b3067f 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -134,7 +134,7 @@ Reference< XIndexAccess > ItemContainer::deepCopyContainer( const Reference< XIn return xReturn; } -const Sequence< sal_Int8 >& ItemContainer::getUnoTunnelId() throw() +const Sequence< sal_Int8 >& ItemContainer::getUnoTunnelId() noexcept { static const UnoTunnelIdInit theItemContainerUnoTunnelId; return theItemContainerUnoTunnelId.getSeq(); diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 6dc1f1587452..af754788de8a 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -146,7 +146,7 @@ sal_Int64 RootItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& return 0; } -const Sequence< sal_Int8 >& RootItemContainer::getUnoTunnelId() throw() +const Sequence< sal_Int8 >& RootItemContainer::getUnoTunnelId() noexcept { static const UnoTunnelIdInit theRootItemContainerUnoTunnelId; return theRootItemContainerUnoTunnelId.getSeq(); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 9f79f0ac7a14..a994cf36f292 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -79,12 +79,12 @@ ToolbarLayoutManager::~ToolbarLayoutManager() // XInterface -void SAL_CALL ToolbarLayoutManager::acquire() throw() +void SAL_CALL ToolbarLayoutManager::acquire() noexcept { OWeakObject::acquire(); } -void SAL_CALL ToolbarLayoutManager::release() throw() +void SAL_CALL ToolbarLayoutManager::release() noexcept { OWeakObject::release(); } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 71b00310151e..3741875c1d3f 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -120,8 +120,8 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW // XInterface - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; // XEventListener diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 3fdf6c0af01c..495d22cee201 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -467,9 +467,9 @@ public: } // XInterface - virtual void SAL_CALL acquire() throw () override + virtual void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw () override + virtual void SAL_CALL release() noexcept override { OWeakObject::release(); } virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override; diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index b58091294231..6dcef5a80061 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -191,9 +191,9 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override; - virtual void SAL_CALL acquire() throw () override + virtual void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw () override + virtual void SAL_CALL release() noexcept override { OWeakObject::release(); } // XTypeProvider diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 6c5c3fdeb88c..a3ccbc0cd38d 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -75,12 +75,12 @@ uno::Any SAL_CALL ButtonToolbarController::queryInterface( const uno::Type& rTyp return cppu::OWeakObject::queryInterface( rType ); } -void SAL_CALL ButtonToolbarController::acquire() throw () +void SAL_CALL ButtonToolbarController::acquire() noexcept { cppu::OWeakObject::acquire(); } -void SAL_CALL ButtonToolbarController::release() throw () +void SAL_CALL ButtonToolbarController::release() noexcept { cppu::OWeakObject::release(); } diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 9d39e2623dce..a8bf9a845f6c 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -44,13 +44,13 @@ using namespace ::com::sun::star::ui; namespace framework { -void SAL_CALL MenuBarWrapper::acquire() throw() \ +void SAL_CALL MenuBarWrapper::acquire() noexcept \ { \ /* Don't use mutex in methods of XInterface! */ \ UIConfigElementWrapperBase::acquire(); \ } \ \ -void SAL_CALL MenuBarWrapper::release() throw() \ +void SAL_CALL MenuBarWrapper::release() noexcept \ { \ /* Don't use mutex in methods of XInterface! */ \ UIConfigElementWrapperBase::release(); \ diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 1199cd7ca51a..0928c5a4702a 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -56,12 +56,12 @@ ToolBarWrapper::~ToolBarWrapper() } // XInterface -void SAL_CALL ToolBarWrapper::acquire() throw() +void SAL_CALL ToolBarWrapper::acquire() noexcept { UIConfigElementWrapperBase::acquire(); } -void SAL_CALL ToolBarWrapper::release() throw() +void SAL_CALL ToolBarWrapper::release() noexcept { UIConfigElementWrapperBase::release(); } -- cgit