diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 5ddf269cbb59..210b5040e79a 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -494,7 +494,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/awt,\
AccessibleStatusBar \
AccessibleStatusBarItem \
AccessibleTabBar \
- AccessibleTabBarPage \
AccessibleTabControl \
AccessibleTabPage \
AccessibleWindow \
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
deleted file mode 100644
index ed54260db689..000000000000
--- a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-module com { module sun { module star { module awt {
-
-/** specifies accessibility support for a tabbar page.
-
- @since OOo 1.1.2
- */
-service AccessibleTabBarPage
-{
- /** This interface gives access to the structural information of a
- tabbar page:
-
-
- - Role: The role of a tabbar page is
- com::sun::star::accessibility::AccessibleRole::PAGE_TAB.
- - Name: The name of a tabbar page is the localized
- tabbar page text.
- - Description: The description of a tabbar page is its localized
- help text.
- - Children: There are no children.
- - Parent: The parent of a tabbar page is the tabbar page list.
- - Relations: There are no relations.
- - States: The states supported by this service are
-
- - com::sun::star::accessibility::AccessibleStateType::DEFUNC
- is set if the object has already been disposed
- and subsequent calls to this object result in
- com::sun::star::lang::DisposedException
- exceptions.
- - com::sun::star::accessibility::AccessibleStateType::ENABLED
- is set if the object is enabled.
- - com::sun::star::accessibility::AccessibleStateType::SELECTABLE
- is always set.
- - com::sun::star::accessibility::AccessibleStateType::SELECTED
- is set if the object is selected.
- - com::sun::star::accessibility::AccessibleStateType::SHOWING
- is set if the object is displayed on the screen.
- - com::sun::star::accessibility::AccessibleStateType::VISIBLE
- is always set.
-
-
-
- */
- interface ::com::sun::star::accessibility::XAccessibleContext;
-
- interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
- interface ::com::sun::star::accessibility::XAccessibleComponent;
-
- interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
-
-};
-
-}; }; }; };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/accessibletabbarpage.cxx b/svtools/source/control/accessibletabbarpage.cxx
index bc466cbcce53..9c705a2f0d2b 100644
--- a/svtools/source/control/accessibletabbarpage.cxx
+++ b/svtools/source/control/accessibletabbarpage.cxx
@@ -42,11 +42,11 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
using namespace ::comphelper;
-
-AccessibleTabBarPage::AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId, const Reference< XAccessible >& rxParent )
- :ImplInheritanceHelper( pTabBar )
- ,m_nPageId( nPageId )
- ,m_xParent( rxParent )
+AccessibleTabBarPage::AccessibleTabBarPage(TabBar* pTabBar, sal_uInt16 nPageId,
+ const Reference& rxParent)
+ : AccessibleTabBarBase(pTabBar)
+ , m_nPageId(nPageId)
+ , m_xParent(rxParent)
{
m_bShowing = IsShowing();
m_bSelected = IsSelected();
@@ -191,27 +191,6 @@ void AccessibleTabBarPage::disposing()
m_sPageText.clear();
}
-
-// XServiceInfo
-
-
-OUString AccessibleTabBarPage::getImplementationName()
-{
- return u"com.sun.star.comp.svtools.AccessibleTabBarPage"_ustr;
-}
-
-
-sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName )
-{
- return cppu::supportsService(this, rServiceName);
-}
-
-
-Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames()
-{
- return { u"com.sun.star.awt.AccessibleTabBarPage"_ustr };
-}
-
// XAccessibleContext
diff --git a/svtools/source/control/accessibletabbarpage.hxx b/svtools/source/control/accessibletabbarpage.hxx
index 9a3048579884..c038b86e1cd8 100644
--- a/svtools/source/control/accessibletabbarpage.hxx
+++ b/svtools/source/control/accessibletabbarpage.hxx
@@ -28,8 +28,7 @@
namespace accessibility
{
-class AccessibleTabBarPage final
- : public cppu::ImplInheritanceHelper
+class AccessibleTabBarPage final : public AccessibleTabBarBase
{
friend class AccessibleTabBarPageList;
@@ -61,11 +60,6 @@ public:
AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId,
const css::uno::Reference< css::accessibility::XAccessible >& rxParent );
- // XServiceInfo
- virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override;