diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 17:27:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 10:29:25 +0000 |
| commit | d3080dc586b2cdaaf56d9fa1172488b4901fb7db (patch) | |
| tree | 1a71daaea54905b2d2d8261ebcd089eb93ca74b8 /accessibility | |
| parent | 435cc6f4b2d61df932a1006222b699e367e4fed7 (diff) | |
Use ImplInheritanceHelper in VCLXAccessibleRadioButton
Change-Id: If07a07cf4e6fa465d1d6d3e52abe550922edeb6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146234
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/vclxaccessibleradiobutton.hxx | 20 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessibleradiobutton.cxx | 12 |
2 files changed, 6 insertions, 26 deletions
diff --git a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx index 4bffbf267c62..4e93579fa9c1 100644 --- a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx +++ b/accessibility/inc/standard/vclxaccessibleradiobutton.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 > VCLXAccessibleRadioButton_BASE; - -class VCLXAccessibleRadioButton final : public VCLXAccessibleTextComponent, - public VCLXAccessibleRadioButton_BASE +class VCLXAccessibleRadioButton final : public cppu::ImplInheritanceHelper< + VCLXAccessibleTextComponent, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue> { virtual ~VCLXAccessibleRadioButton() override = default; @@ -43,13 +41,7 @@ class VCLXAccessibleRadioButton final : public VCLXAccessibleTextComponent, virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; public: - using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent; - - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + VCLXAccessibleRadioButton( VCLXWindow* pVCLXWindow ): ImplInheritanceHelper(pVCLXWindow) {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index c9ba225eb4ab..b6937b38c27e 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -105,18 +105,6 @@ void VCLXAccessibleRadioButton::FillAccessibleStateSet( sal_Int64& rStateSet ) } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleRadioButton, VCLXAccessibleTextComponent, VCLXAccessibleRadioButton_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextComponent, VCLXAccessibleRadioButton_BASE ) - - // XServiceInfo |