diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 17:35:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 11:47:10 +0000 |
| commit | b1883a0ff9f8e62a83bdcc94f4ff0dd01b2a56d6 (patch) | |
| tree | d65511636e8f820ceb952051b3cf95d4f04d95af /accessibility | |
| parent | 90a64d3ca1fdf75df1dcebebbd250e09b21cc7bf (diff) | |
Use ImplInheritanceHelper in VCLXAccessibleTabControl
Change-Id: I9426bac6b26feaa555842142dd3ce62bbe5f4a69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146237
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/vclxaccessibletabcontrol.hxx | 16 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessibletabcontrol.cxx | 14 |
2 files changed, 5 insertions, 25 deletions
diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index 9827f9ba6b67..dcf515775bd7 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -21,7 +21,7 @@ #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/tabctrl.hxx> #include <vcl/vclptr.hxx> @@ -30,11 +30,9 @@ -typedef ::cppu::ImplHelper1 < - css::accessibility::XAccessibleSelection > VCLXAccessibleTabControl_BASE; - -class VCLXAccessibleTabControl final : public VCLXAccessibleComponent, - public VCLXAccessibleTabControl_BASE +class VCLXAccessibleTabControl final : public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessibleSelection> { private: typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; @@ -64,12 +62,6 @@ private: public: VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index a3c9eb03c476..9963b51aef5f 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -42,7 +42,7 @@ using namespace ::comphelper; VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow ) - :VCLXAccessibleComponent( pVCLXWindow ) + :ImplInheritanceHelper( pVCLXWindow ) { m_pTabControl = GetAs<TabControl>(); if (!m_pTabControl) @@ -291,18 +291,6 @@ void VCLXAccessibleTabControl::FillAccessibleStateSet( sal_Int64& rStateSet ) } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabControl, VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabControl, VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE ) - - // XComponent |