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>

3 files changed, 88 insertions, 144 deletions

diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index d9d1124bbb79..36893816b569 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_sdk_api,editeng))
 
 ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
 $(eval $(call gb_Library_add_exception_objects,editeng,\
-    editeng/source/accessibility/AccessibleComponentBase \
     editeng/source/accessibility/AccessibleContextBase \
     editeng/source/accessibility/AccessibleEditableTextPara \
     editeng/source/accessibility/AccessibleHyperlink \
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
deleted file mode 100644
index 4b1d5438b735..000000000000
--- a/editeng/source/accessibility/AccessibleComponentBase.cxx
+++ /dev/null
@@ -1,143 +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 .
- */
-
-#include <editeng/AccessibleComponentBase.hxx>
-
-#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-
-#include <tools/color.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
-
-namespace accessibility {
-
-// internal
-
-AccessibleComponentBase::AccessibleComponentBase()
-{
-}
-
-
-AccessibleComponentBase::~AccessibleComponentBase()
-{
-}
-
-// XAccessibleComponent
-
-sal_Bool SAL_CALL AccessibleComponentBase::containsPoint (
-        const css::awt::Point& aPoint)
-{
-    awt::Size aSize (getSize());
-    return (aPoint.X >= 0)
-        && (aPoint.X < aSize.Width)
-        && (aPoint.Y >= 0)
-        && (aPoint.Y < aSize.Height);
-}
-
-
-uno::Reference<XAccessible > SAL_CALL
-    AccessibleComponentBase::getAccessibleAtPoint (
-        const awt::Point& /*aPoint*/)
-{
-    return uno::Reference<XAccessible>();
-}
-
-
-awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds()
-{
-    return awt::Rectangle();
-}
-
-
-awt::Point SAL_CALL AccessibleComponentBase::getLocation()
-{
-    awt::Rectangle aBBox (getBounds());
-    return awt::Point (aBBox.X, aBBox.Y);
-}
-
-
-awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen()
-{
-    return awt::Point();
-}
-
-
-css::awt::Size SAL_CALL AccessibleComponentBase::getSize()
-{
-    awt::Rectangle aBBox (getBounds());
-    return awt::Size (aBBox.Width, aBBox.Height);
-}
-
-
-void SAL_CALL AccessibleComponentBase::grabFocus()
-{
-    uno::Reference<XAccessibleContext> xContext (this, uno::UNO_QUERY);
-    uno::Reference<XAccessibleSelection> xSelection (
-        xContext->getAccessibleParent(), uno::UNO_QUERY);
-    if (xSelection.is())
-    {
-        // Do a single selection on this object.
-        xSelection->clearAccessibleSelection();
-        xSelection->selectAccessibleChild (xContext->getAccessibleIndexInParent());
-    }
-}
-
-
-sal_Int32 SAL_CALL AccessibleComponentBase::getForeground()
-{
-    return sal_Int32(COL_BLACK);
-}
-
-
-sal_Int32 SAL_CALL AccessibleComponentBase::getBackground()
-{
-    return sal_Int32(COL_WHITE);
-}
-
-
-// XAccessibleExtendedComponent
-
-
-OUString SAL_CALL AccessibleComponentBase::getTitledBorderText()
-{
-    return OUString();
-}
-
-
-OUString SAL_CALL AccessibleComponentBase::getToolTipText()
-{
-    return OUString();
-}
-
-// XTypeProvider
-
-uno::Sequence<uno::Type>
-    AccessibleComponentBase::getTypes()
-{
-    static const uno::Sequence aTypeList {
-         cppu::UnoType<XAccessibleComponent>::get(),
-        cppu::UnoType<XAccessibleExtendedComponent>::get() };
-    return aTypeList;
-}
-
-
-} // end of namespace accessibility
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 64d58a39092e..0e7aaed382d6 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -20,6 +20,7 @@
 #include <editeng/AccessibleContextBase.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@@ -31,6 +32,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
+#include <tools/color.hxx>
 
 #include <utility>
 
@@ -359,6 +361,92 @@ void SAL_CALL AccessibleContextBase::removeAccessibleEventListener (
     }
 }
 
+
+// XAccessibleComponent
+
+sal_Bool SAL_CALL AccessibleContextBase::containsPoint (
+    const css::awt::Point& aPoint)
+{
+    awt::Size aSize (getSize());
+    return (aPoint.X >= 0)
+           && (aPoint.X < aSize.Width)
+           && (aPoint.Y >= 0)
+           && (aPoint.Y < aSize.Height);
+}
+
+
+uno::Reference<XAccessible > SAL_CALL
+AccessibleContextBase::getAccessibleAtPoint (
+    const awt::Point& /*aPoint*/)
+{
+    return uno::Reference<XAccessible>();
+}
+
+
+awt::Rectangle SAL_CALL AccessibleContextBase::getBounds()
+{
+    return awt::Rectangle();
+}
+
+
+awt::Point SAL_CALL AccessibleContextBase::getLocation()
+{
+    awt::Rectangle aBBox (getBounds());
+    return awt::Point (aBBox.X, aBBox.Y);
+}
+
+
+awt::Point SAL_CALL AccessibleContextBase::getLocationOnScreen()
+{
+    return awt::Point();
+}
+
+
+css::awt::Size SAL_CALL AccessibleContextBase::getSize()
+{
+    awt::Rectangle aBBox (getBounds());
+    return awt::Size (aBBox.Width, aBBox.Height);
+}
+
+
+void SAL_CALL AccessibleContextBase::grabFocus()
+{
+    uno::Reference<XAccessibleSelection> xSelection(getAccessibleParent(), uno::UNO_QUERY);
+    if (xSelection.is())
+    {
+        // Do a single selection on this object.
+        xSelection->clearAccessibleSelection();
+        xSelection->selectAccessibleChild (getAccessibleIndexInParent());
+    }
+}
+
+
+sal_Int32 SAL_CALL AccessibleContextBase::getForeground()
+{
+    return sal_Int32(COL_BLACK);
+}
+
+
+sal_Int32 SAL_CALL AccessibleContextBase::getBackground()
+{
+    return sal_Int32(COL_WHITE);
+}
+
+
+// XAccessibleExtendedComponent
+
+
+OUString SAL_CALL AccessibleContextBase::getTitledBorderText()
+{
+    return OUString();
+}
+
+
+OUString SAL_CALL AccessibleContextBase::getToolTipText()
+{
+    return OUString();
+}
+
 // XServiceInfo
 OUString SAL_CALL AccessibleContextBase::getImplementationName()
 {