diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx index 4476ed7c89a1..ffaa7f689a78 100644 --- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx @@ -24,17 +24,15 @@ #include #include -#include +#include -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleValue > VCLXAccessibleScrollBar_BASE; - -class VCLXAccessibleScrollBar final : public VCLXAccessibleComponent, - public VCLXAccessibleScrollBar_BASE +class VCLXAccessibleScrollBar final : public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue> { virtual ~VCLXAccessibleScrollBar() override = default; @@ -42,13 +40,7 @@ class VCLXAccessibleScrollBar final : public VCLXAccessibleComponent, virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; public: - using VCLXAccessibleComponent::VCLXAccessibleComponent; - - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + VCLXAccessibleScrollBar( VCLXWindow* pVCLXWindow ): ImplInheritanceHelper(pVCLXWindow) {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 8b001ea0f232..4ea6f788bb3c 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -76,18 +76,6 @@ void VCLXAccessibleScrollBar::FillAccessibleStateSet( sal_Int64& rStateSet ) } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE ) - - // XServiceInfo