diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 13:46:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 19:55:22 +0000 |
| commit | 7c63d968bb0c4e1df25bc39e64574326cf83d4ec (patch) | |
| tree | fcacaba8160a12e94f9e82677a1333d959f8a6dd /accessibility | |
| parent | e8335bac5690b6beccb5ca9b36281c89fb2f28f5 (diff) | |
Use ImplInheritanceHelper in VCLXAccessibleButton
Change-Id: Ia5c384e7ae4b78e008836fafc5433accd8489f07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146187
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/vclxaccessiblebutton.hxx | 20 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblebutton.cxx | 12 |
2 files changed, 6 insertions, 26 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx index 282e7ed7e817..460c90c67c41 100644 --- a/accessibility/inc/standard/vclxaccessiblebutton.hxx +++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx @@ -24,17 +24,15 @@ #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleValue > VCLXAccessibleButton_BASE; - -class VCLXAccessibleButton final : public VCLXAccessibleTextComponent, - public VCLXAccessibleButton_BASE +class VCLXAccessibleButton final : public cppu::ImplInheritanceHelper< + VCLXAccessibleTextComponent, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue> { virtual ~VCLXAccessibleButton() override = default; @@ -42,13 +40,7 @@ class VCLXAccessibleButton final : public VCLXAccessibleTextComponent, virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; public: - using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent; - - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + VCLXAccessibleButton( VCLXWindow* pVCLXWindow ): ImplInheritanceHelper(pVCLXWindow) {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index e73f56c74a22..52153a0c22b9 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -96,18 +96,6 @@ void VCLXAccessibleButton::FillAccessibleStateSet( sal_Int64& rStateSet ) } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleButton, VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE ) - - // XServiceInfo |