accessibility/inc/standard/vclxaccessibletabpage.hxx | 18 ++++------------
accessibility/source/standard/vclxaccessibletabpage.cxx | 12 ----------
2 files changed, 5 insertions(+), 25 deletions(-)
New commits:
commit cf38f560d0e5a46edd79f28db5284e32a3679dbc
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 17:38:12 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 27 11:47:21 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleTabPage
Change-Id: Ia1b4df33d426265d5eb6f0b77c531ab3b53ea3d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146238
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
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
