summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2025-03-31 10:44:21 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2025-04-01 11:19:38 +0200
commit18b7dc796fa2a72a6b56263a5dff35a80536b0af (patch)
treeda02cf4aaf1d2a3827ee9f7b4e37b3a78bb64511 /sd/source/ui
parenta5eb44c1e6db95ef6e3c478c7feb3b3849c1164a (diff)
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>
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx2
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx2
2 files changed, 0 insertions, 4 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 3fba334ce872..8f1b489571da 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -422,8 +422,6 @@ css::uno::Sequence< css::uno::Type> SAL_CALL
return comphelper::concatSequences(
// Get list of types from the context base implementation, ...
AccessibleContextBase::getTypes(),
- // ... get list of types from component base implementation, ...
- AccessibleComponentBase::getTypes(),
// ...and add the additional type for the component, ...
css::uno::Sequence {
cppu::UnoType<lang::XEventListener>::get(),
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index a514cfc42462..798e94e2490b 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLEDOCUMENTVIEWBASE_HXX
#include <editeng/AccessibleContextBase.hxx>
-#include <editeng/AccessibleComponentBase.hxx>
#include <editeng/AccessibleSelectionBase.hxx>
#include "AccessibleViewForwarder.hxx"
#include <svx/AccessibleShapeTreeInfo.hxx>
@@ -80,7 +79,6 @@ namespace accessibility {
*/
class AccessibleDocumentViewBase
: public AccessibleContextBase,
- public AccessibleComponentBase,
public AccessibleSelectionBase,
public IAccessibleViewForwarderListener,
public css::beans::XPropertyChangeListener,