diff options
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 |