diff --git a/toolkit/inc/controls/table/AccessibleGridControl.hxx b/toolkit/inc/controls/table/AccessibleGridControl.hxx index 684ad389ff89..50611f8efbe4 100644 --- a/toolkit/inc/controls/table/AccessibleGridControl.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControl.hxx @@ -63,13 +63,6 @@ namespace accessibility { /** Grabs the focus to the Grid Control. */ virtual void SAL_CALL grabFocus() override; - // XServiceInfo ----------------------------------------------------------- - - /** @return - The name of this class. - */ - virtual OUString SAL_CALL getImplementationName() override; - public: AccessibleGridControl( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, diff --git a/toolkit/inc/controls/table/AccessibleGridControlBase.hxx b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx index 930ddb0a6eb3..9beccb3793f9 100644 --- a/toolkit/inc/controls/table/AccessibleGridControlBase.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -42,8 +41,7 @@ namespace accessibility { /** The GridControl accessible objects inherit from this base class. It implements basic functionality. */ -class AccessibleGridControlBase - : public cppu::ImplInheritanceHelper +class AccessibleGridControlBase : public comphelper::OAccessible { public: /** Constructor. @@ -115,18 +113,6 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override; - // XServiceInfo - - /** @return Whether the specified service is supported by this class. */ - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; - - /** @return a list of all supported services. */ - virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() override; - - /* Derived classes have to implement: - - getImplementationName. */ - // helper methods /** @return The GridControl object type. */ diff --git a/toolkit/inc/controls/table/AccessibleGridControlHeader.hxx b/toolkit/inc/controls/table/AccessibleGridControlHeader.hxx index fe0d7cd1bd52..09c83fa383cb 100644 --- a/toolkit/inc/controls/table/AccessibleGridControlHeader.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlHeader.hxx @@ -106,11 +106,6 @@ public: /** @return TRUE, if the specified cell is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; - // XServiceInfo - - /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() override; - private: /** Returns the specified row or column. Uses one of the parameters, depending on object type. diff --git a/toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx b/toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx index 25e6c3dd06ca..27d33a36ce30 100644 --- a/toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx @@ -44,11 +44,6 @@ namespace accessibility /** Grabs the focus to the GridControl. */ virtual void SAL_CALL grabFocus() override; - /** @return - The name of this class. - */ - virtual OUString SAL_CALL getImplementationName() override; - /** Return a bitset of states of the current object. */ sal_Int64 implCreateStateSet() override; diff --git a/toolkit/inc/controls/table/AccessibleGridControlTable.hxx b/toolkit/inc/controls/table/AccessibleGridControlTable.hxx index e9e29fc40e89..4a6e0d8b9b2a 100644 --- a/toolkit/inc/controls/table/AccessibleGridControlTable.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlTable.hxx @@ -124,11 +124,6 @@ public: /** Removes the specified row/column from the selection. */ virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; - // XServiceInfo - - /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() override; - // XComponent virtual void SAL_CALL dispose() override; diff --git a/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx b/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx index a618a33a09c2..2fee536007b2 100644 --- a/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx @@ -78,11 +78,6 @@ public: /** @return The index of this object among the parent's children. */ virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; - /** @return - The name of this class. - */ - virtual OUString SAL_CALL getImplementationName() override; - /** @return The count of visible children. */ diff --git a/toolkit/source/controls/table/AccessibleGridControl.cxx b/toolkit/source/controls/table/AccessibleGridControl.cxx index 30710e27aa10..5ec405b0ef53 100644 --- a/toolkit/source/controls/table/AccessibleGridControl.cxx +++ b/toolkit/source/controls/table/AccessibleGridControl.cxx @@ -167,12 +167,6 @@ void SAL_CALL AccessibleGridControl::grabFocus() m_aTable.GrabFocus(); } -// XServiceInfo --------------------------------------------------------------- -OUString SAL_CALL AccessibleGridControl::getImplementationName() -{ - return u"com.sun.star.accessibility.AccessibleGridControl"_ustr; -} - // internal virtual methods --------------------------------------------------- AbsoluteScreenPixelRectangle AccessibleGridControl::implGetBoundingBoxOnScreen() diff --git a/toolkit/source/controls/table/AccessibleGridControlBase.cxx b/toolkit/source/controls/table/AccessibleGridControlBase.cxx index e15970630ff3..55850f7f5942 100644 --- a/toolkit/source/controls/table/AccessibleGridControlBase.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlBase.cxx @@ -124,18 +124,6 @@ lang::Locale SAL_CALL AccessibleGridControlBase::getLocale() throw IllegalAccessibleComponentStateException(); } -// XServiceInfo - -sal_Bool SAL_CALL AccessibleGridControlBase::supportsService( - const OUString& rServiceName ) -{ - return cppu::supportsService(this, rServiceName); -} - -Sequence< OUString > SAL_CALL AccessibleGridControlBase::getSupportedServiceNames() -{ - return { u"com.sun.star.accessibility.AccessibleContext"_ustr }; -} // internal virtual methods bool AccessibleGridControlBase::implIsShowing() diff --git a/toolkit/source/controls/table/AccessibleGridControlHeader.cxx b/toolkit/source/controls/table/AccessibleGridControlHeader.cxx index cfc77929d4d5..96063a3f9b3b 100644 --- a/toolkit/source/controls/table/AccessibleGridControlHeader.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlHeader.cxx @@ -165,13 +165,6 @@ sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected( return false; } -// XServiceInfo --------------------------------------------------------------- - -OUString SAL_CALL AccessibleGridControlHeader::getImplementationName() -{ - return u"com.sun.star.accessibility.AccessibleGridControlHeader"_ustr; -} - // internal virtual methods --------------------------------------------------- AbsoluteScreenPixelRectangle AccessibleGridControlHeader::implGetBoundingBoxOnScreen() diff --git a/toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx b/toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx index 522a0a6dbbda..9487e748a339 100644 --- a/toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx @@ -90,14 +90,6 @@ void SAL_CALL AccessibleGridControlHeaderCell::grabFocus() { } -/** @return - The name of this class. -*/ -OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName() -{ - return u"com.sun.star.accessibility.AccessibleGridControlHeaderCell"_ustr; -} - AbsoluteScreenPixelRectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen() { AbsoluteScreenPixelRectangle aGridRect( m_aTable.GetWindowExtentsAbsolute() ); diff --git a/toolkit/source/controls/table/AccessibleGridControlTable.cxx b/toolkit/source/controls/table/AccessibleGridControlTable.cxx index 0f4435bf5cf1..e147af83e213 100644 --- a/toolkit/source/controls/table/AccessibleGridControlTable.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlTable.cxx @@ -270,13 +270,6 @@ void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild( ensureAlive(); } -// XServiceInfo --------------------------------------------------------------- - -OUString SAL_CALL AccessibleGridControlTable::getImplementationName() -{ - return u"com.sun.star.accessibility.AccessibleGridControlTable"_ustr; -} - void AccessibleGridControlTable::dispose() { for (rtl::Reference& rxCell : m_aCellVector) diff --git a/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx b/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx index b690505d720b..bb21d459a393 100644 --- a/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx @@ -123,14 +123,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint(const css::aw return m_aTable.GetIndexForPoint(vcl::unohelper::ConvertToVCLPoint(_aPoint)); } -/** @return - The name of this class. - */ -OUString SAL_CALL AccessibleGridControlTableCell::getImplementationName() -{ - return u"com.sun.star.accessibility.AccessibleGridControlTableCell"_ustr; -} - /** @return The count of visible children. */ sal_Int64 SAL_CALL AccessibleGridControlTableCell::getAccessibleChildCount() { return 0; }