accessibility/inc/extended/accessibletabbar.hxx | 18 +++++-------------
accessibility/source/extended/accessibletabbar.cxx | 14 +-------------
2 files changed, 6 insertions(+), 26 deletions(-)
New commits:
commit 5db518df93aa5ed8c87bdd20cf911d584c06ddeb
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 23 16:00:27 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 25 18:55:47 2023 +0000
Use ImplInheritanceHelper in AccessibleTabBar
Change-Id: I709b18500f417f3f7019118bc2a298e73bbedcea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146113
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/extended/accessibletabbar.hxx
b/accessibility/inc/extended/accessibletabbar.hxx
index f2795b59106e..b921fdb16719 100644
--- a/accessibility/inc/extended/accessibletabbar.hxx
+++ b/accessibility/inc/extended/accessibletabbar.hxx
@@ -21,7 +21,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <extended/accessibletabbarbase.hxx>
#include <vector>
@@ -33,12 +33,10 @@ namespace accessibility
- typedef ::cppu::ImplHelper2<
- css::accessibility::XAccessible,
- css::lang::XServiceInfo > AccessibleTabBar_BASE;
-
- class AccessibleTabBar final : public AccessibleTabBarBase,
- public AccessibleTabBar_BASE
+ class AccessibleTabBar final : public cppu::ImplInheritanceHelper<
+ AccessibleTabBarBase,
+ css::accessibility::XAccessible,
+ css::lang::XServiceInfo>
{
typedef std::vector< css::uno::Reference<
css::accessibility::XAccessible > > AccessibleChildren;
@@ -56,12 +54,6 @@ namespace accessibility
public:
AccessibleTabBar( TabBar* pTabBar );
- // 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/extended/accessibletabbar.cxx
b/accessibility/source/extended/accessibletabbar.cxx
index 0a9747a3e708..cb7568946ae3 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -51,7 +51,7 @@ namespace accessibility
AccessibleTabBar::AccessibleTabBar( TabBar* pTabBar )
- :AccessibleTabBarBase( pTabBar )
+ :ImplInheritanceHelper( pTabBar )
{
if ( m_pTabBar )
m_aAccessibleChildren.assign(
m_pTabBar->GetAccessibleChildWindowCount() + 1, Reference< XAccessible >() );
@@ -152,18 +152,6 @@ namespace accessibility
}
- // XInterface
-
-
- IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBar,
OAccessibleExtendedComponentHelper, AccessibleTabBar_BASE )
-
-
- // XTypeProvider
-
-
- IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBar,
OAccessibleExtendedComponentHelper, AccessibleTabBar_BASE )
-
-
// XComponent
