diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-23 16:01:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-25 18:56:06 +0000 |
| commit | 02fbe937dc85772c463e40589a179d4a01770562 (patch) | |
| tree | b6f0654e3003784f4cf4aa41e8a34ebeb4e4c88c /accessibility | |
| parent | 5db518df93aa5ed8c87bdd20cf911d584c06ddeb (diff) | |
Use ImplInheritanceHelper in AccessibleTabBarPage
Change-Id: I25092aa7307d9f1d69fbb29eb9a2db74071f760f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146114
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/extended/accessibletabbarpage.hxx | 18 | ||||
| -rw-r--r-- | accessibility/source/extended/accessibletabbarpage.cxx | 14 |
2 files changed, 6 insertions, 26 deletions
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 |