diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 17:38:12 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 11:47:21 +0000 |
| commit | cf38f560d0e5a46edd79f28db5284e32a3679dbc (patch) | |
| tree | ee90466d1fbf48f046e7a21e7c95d5a31287f964 /accessibility | |
| parent | b1883a0ff9f8e62a83bdcc94f4ff0dd01b2a56d6 (diff) | |
Use ImplInheritanceHelper in VCLXAccessibleTabPage
Change-Id: Ia1b4df33d426265d5eb6f0b77c531ab3b53ea3d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146238
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/vclxaccessibletabpage.hxx | 18 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessibletabpage.cxx | 12 |
2 files changed, 5 insertions, 25 deletions
diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx index 0548ef344634..bb3d720055a0 100644 --- a/accessibility/inc/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessibletexthelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/vclptr.hxx> @@ -33,12 +33,10 @@ class TabControl; typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE; -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::lang::XServiceInfo > VCLXAccessibleTabPage_BASE; - -class VCLXAccessibleTabPage final : public AccessibleTextHelper_BASE, - public VCLXAccessibleTabPage_BASE +class VCLXAccessibleTabPage final : public cppu::ImplInheritanceHelper< + AccessibleTextHelper_BASE, + css::accessibility::XAccessible, + css::lang::XServiceInfo> { friend class VCLXAccessibleTabControl; @@ -80,12 +78,6 @@ public: VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt16 nPageId ); virtual ~VCLXAccessibleTabPage() override; - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 5175ab68e160..0dae45ca840c 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -219,18 +219,6 @@ void VCLXAccessibleTabPage::implGetSelection( sal_Int32& nStartIndex, sal_Int32& } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabPage, AccessibleTextHelper_BASE, VCLXAccessibleTabPage_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabPage, AccessibleTextHelper_BASE, VCLXAccessibleTabPage_BASE ) - - // XComponent |