editeng a11y: Merge Accessible{Context,Component}Base

AccessibleContextBase and AccessibleComponentBase
are both subclassed by the exact same classes.

Merge AccessibleComponentBase into AccessibleContextBase
to simplify the class hierarchy.

Drop now unnecessary overrides.

This also aligns AccessibleContext further
with the comphelper::OAccessibleExtendedComponentHelper
class that also implements both, XAccessibleContext
and XAccessibleExtendedComponent, and thus also prepares
for potential refactoring to deduplicate code in those
two classes in the future.

Change-Id: Ia3331f2bd4563bf9cdfee35c9ea6cca91bd093cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183543
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>

1 files changed, 3 insertions, 52 deletions

diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 65b74d4ae6de..be3dba4956ad 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::lang;
 namespace accessibility {
 
 AccessibleCell::AccessibleCell( const rtl::Reference< AccessibleTableShape>& rxParent, sdr::table::CellRef xCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo )
-: AccessibleCellBase( rxParent, AccessibleRole::TABLE_CELL )
+: AccessibleContextBase(rxParent, AccessibleRole::TABLE_CELL)
 , maShapeTreeInfo( rShapeTreeInfo )
 , mnIndexInParent( nIndex )
 , mxCell(std::move( xCell ))
@@ -123,28 +123,6 @@ bool AccessibleCell::ResetState (sal_Int64 aState)
     return bStateHasChanged;
 }
 
-
-// XInterface
-
-
-Any SAL_CALL AccessibleCell::queryInterface( const Type& aType )
-{
-    return AccessibleCellBase::queryInterface( aType );
-}
-
-
-void SAL_CALL AccessibleCell::acquire(  ) noexcept
-{
-    AccessibleCellBase::acquire();
-}
-
-
-void SAL_CALL AccessibleCell::release(  ) noexcept
-{
-    AccessibleCellBase::release();
-}
-
-
 // XAccessibleContext
 
 
@@ -229,12 +207,6 @@ sal_Int64 SAL_CALL AccessibleCell::getAccessibleStateSet()
 
 // XAccessibleComponent
 
-
-sal_Bool SAL_CALL AccessibleCell::containsPoint( const css::awt::Point& aPoint)
-{
-    return AccessibleComponentBase::containsPoint( aPoint );
-}
-
 /** The implementation below is at the moment straightforward.  It iterates
     over all children (and thereby instances all children which have not
     been already instantiated) until a child covering the specified point is
@@ -359,12 +331,6 @@ awt::Size SAL_CALL AccessibleCell::getSize()
 }
 
 
-void SAL_CALL AccessibleCell::grabFocus()
-{
-    AccessibleComponentBase::grabFocus();
-}
-
-
 sal_Int32 SAL_CALL AccessibleCell::getForeground()
 {
     ThrowIfDisposed ();
@@ -382,21 +348,6 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground()
     return 0;
 }
 
-
-// XAccessibleExtendedComponent
-
-OUString SAL_CALL AccessibleCell::getTitledBorderText()
-{
-    return AccessibleComponentBase::getTitledBorderText();
-}
-
-
-OUString SAL_CALL AccessibleCell::getToolTipText()
-{
-    return AccessibleComponentBase::getToolTipText();
-}
-
-
 // XAccessibleEventBroadcaster
 
 
@@ -549,7 +500,7 @@ OUString SAL_CALL AccessibleCell::getAccessibleName()
         }
     }
 
-    return AccessibleCellBase::getAccessibleName();
+    return AccessibleContextBase::getAccessibleName();
 }
 
 void AccessibleCell::UpdateChildren()
@@ -570,7 +521,7 @@ OUString SAL_CALL AccessibleCell::getAccessibleName() throw (css::uno::RuntimeEx
     if( mxCell.is() )
         return mxCell->getName();
 
-    return AccessibleCellBase::getAccessibleName();
+    return AccessibleContextBase::getAccessibleName();
 }
 */