diff options
Diffstat (limited to 'framework/inc/classes/actiontriggerpropertyset.hxx')
| -rw-r--r-- | framework/inc/classes/actiontriggerpropertyset.hxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index 964d25d99f86..9ac0170b072f 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX -#define INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX +#pragma once #include <cppuhelper/basemutex.hxx> #include <cppuhelper/propshlp.hxx> @@ -29,8 +28,8 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger" -#define IMPLEMENTATIONNAME_ACTIONTRIGGER "com.sun.star.comp.ui.ActionTrigger" +inline constexpr OUString SERVICENAME_ACTIONTRIGGER = u"com.sun.star.ui.ActionTrigger"_ustr; +inline constexpr OUString IMPLEMENTATIONNAME_ACTIONTRIGGER = u"com.sun.star.comp.ui.ActionTrigger"_ustr; namespace framework { @@ -48,8 +47,8 @@ class ActionTriggerPropertySet final : private cppu::BaseMutex, // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; - 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; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) override; @@ -83,19 +82,19 @@ class ActionTriggerPropertySet final : private cppu::BaseMutex, // helper /// @throws css::lang::IllegalArgumentException - bool impl_tryToChangeProperty( const OUString& aCurrentValue , + static bool impl_tryToChangeProperty( const OUString& aCurrentValue , const css::uno::Any& aNewValue , css::uno::Any& aOldValue , css::uno::Any& aConvertedValue ); /// @throws css::lang::IllegalArgumentException - bool impl_tryToChangeProperty( const css::uno::Reference< css::awt::XBitmap >& xBitmap, + static bool impl_tryToChangeProperty( const css::uno::Reference< css::awt::XBitmap >& xBitmap, const css::uno::Any& aNewValue , css::uno::Any& aOldValue , css::uno::Any& aConvertedValue ); /// @throws css::lang::IllegalArgumentException - bool impl_tryToChangeProperty( const css::uno::Reference< css::uno::XInterface >& xInterface, + static bool impl_tryToChangeProperty( const css::uno::Reference< css::uno::XInterface >& xInterface, const css::uno::Any& aNewValue , css::uno::Any& aOldValue , css::uno::Any& aConvertedValue ); @@ -111,6 +110,4 @@ class ActionTriggerPropertySet final : private cppu::BaseMutex, } -#endif // INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |