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>
This commit is contained in:
Stephan Bergmann 2023-01-26 13:46:58 +01:00
parent e8335bac56
commit 7c63d968bb
2 changed files with 6 additions and 26 deletions

View file

@ -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;

View file

@ -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