accessibility/inc/extended/accessibletabbarpage.hxx | 18 +++--------
accessibility/inc/extended/accessibletabbarpagelist.hxx | 20 +++----------
accessibility/source/extended/accessibletabbarpage.cxx | 14 ---------
accessibility/source/extended/accessibletabbarpagelist.cxx | 14 ---------
4 files changed, 13 insertions(+), 53 deletions(-)
New commits:
commit 4e0858dd9e1b4831eb117640d5d42f7e1e92fdb8
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 23 16:02:54 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 25 18:56:17 2023 +0000
Use ImplInheritanceHelper in AccessibleTabBarPageList
Change-Id: I1f03912046d94bd0e14f65310d93ec4f539fa304
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146115
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx
b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index 2c7bc2fced93..858a475d7669 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <extended/accessibletabbarbase.hxx>
#include <vector>
@@ -34,13 +34,11 @@ namespace accessibility
- typedef ::cppu::ImplHelper3<
- css::accessibility::XAccessible,
- css::accessibility::XAccessibleSelection,
- css::lang::XServiceInfo > AccessibleTabBarPageList_BASE;
-
- class AccessibleTabBarPageList final : public AccessibleTabBarBase,
- public AccessibleTabBarPageList_BASE
+ class AccessibleTabBarPageList final : public cppu::ImplInheritanceHelper<
+ AccessibleTabBarBase,
+ css::accessibility::XAccessible,
+
css::accessibility::XAccessibleSelection,
+ css::lang::XServiceInfo>
{
private:
typedef std::vector< css::uno::Reference<
css::accessibility::XAccessible > > AccessibleChildren;
@@ -68,12 +66,6 @@ namespace accessibility
public:
AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent );
- // 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/accessibletabbarpagelist.cxx
b/accessibility/source/extended/accessibletabbarpagelist.cxx
index f09d43fd23db..3eb8ab324c37 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -48,7 +48,7 @@ namespace accessibility
AccessibleTabBarPageList::AccessibleTabBarPageList( TabBar* pTabBar,
sal_Int32 nIndexInParent )
- :AccessibleTabBarBase( pTabBar )
+ :ImplInheritanceHelper( pTabBar )
,m_nIndexInParent( nIndexInParent )
{
if ( m_pTabBar )
@@ -326,18 +326,6 @@ namespace accessibility
}
- // XInterface
-
-
- IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPageList,
OAccessibleExtendedComponentHelper, AccessibleTabBarPageList_BASE )
-
-
- // XTypeProvider
-
-
- IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPageList,
OAccessibleExtendedComponentHelper, AccessibleTabBarPageList_BASE )
-
-
// XComponent
commit 02fbe937dc85772c463e40589a179d4a01770562
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 23 16:01:48 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 25 18:56:06 2023 +0000
Use ImplInheritanceHelper in AccessibleTabBarPage
Change-Id: I25092aa7307d9f1d69fbb29eb9a2db74071f760f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146114
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx
b/accessibility/inc/extended/accessibletabbarpage.hxx
index 75f105ae72f3..5fd91f19b538 100644
--- a/accessibility/inc/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.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>
@@ -31,12 +31,10 @@ namespace accessibility
- typedef ::cppu::ImplHelper2<
- css::accessibility::XAccessible,
- css::lang::XServiceInfo > AccessibleTabBarPage_BASE;
-
- class AccessibleTabBarPage final : public AccessibleTabBarBase,
- public AccessibleTabBarPage_BASE
+ class AccessibleTabBarPage final : public cppu::ImplInheritanceHelper<
+ AccessibleTabBarBase,
+ css::accessibility::XAccessible,
+ css::lang::XServiceInfo>
{
friend class AccessibleTabBarPageList;
@@ -70,12 +68,6 @@ namespace accessibility
AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId,
const css::uno::Reference<
css::accessibility::XAccessible >& rxParent );
- // 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/accessibletabbarpage.cxx
b/accessibility/source/extended/accessibletabbarpage.cxx
index ff98170ea480..eab2cf269cf2 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -46,7 +46,7 @@ namespace accessibility
AccessibleTabBarPage::AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16
nPageId, const Reference< XAccessible >& rxParent )
- :AccessibleTabBarBase( pTabBar )
+ :ImplInheritanceHelper( pTabBar )
,m_nPageId( nPageId )
,m_xParent( rxParent )
{
@@ -186,18 +186,6 @@ namespace accessibility
}
- // XInterface
-
-
- IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPage,
OAccessibleExtendedComponentHelper, AccessibleTabBarPage_BASE )
-
-
- // XTypeProvider
-
-
- IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPage,
OAccessibleExtendedComponentHelper, AccessibleTabBarPage_BASE )
-
-
// XComponent
