basctl/source/accessibility/accessibledialogcontrolshape.cxx | 8 ---- basctl/source/accessibility/accessibledialogwindow.cxx | 8 ---- basctl/source/inc/accessibledialogcontrolshape.hxx | 1 basctl/source/inc/accessibledialogwindow.hxx | 1 chart2/source/controller/accessibility/AccessibleBase.cxx | 10 ----- chart2/source/controller/inc/AccessibleBase.hxx | 4 -- editeng/source/accessibility/AccessibleContextBase.cxx | 15 -------- include/editeng/AccessibleContextBase.hxx | 4 -- svtools/source/control/accessibletabbarpage.cxx | 6 --- svtools/source/control/accessibletabbarpage.hxx | 1 svtools/source/control/accessibletabbarpagelist.cxx | 15 -------- svtools/source/control/accessibletabbarpagelist.hxx | 4 -- vcl/inc/accessibility/accessiblemenucomponent.hxx | 4 -- vcl/inc/accessibility/accessiblemenuitemcomponent.hxx | 1 vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx | 1 vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx | 1 vcl/inc/accessibility/vclxaccessibletabpage.hxx | 4 -- vcl/source/accessibility/accessiblemenucomponent.cxx | 19 ----------- vcl/source/accessibility/accessiblemenuitemcomponent.cxx | 8 ---- vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx | 6 --- vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx | 9 ----- vcl/source/accessibility/vclxaccessibletabpage.cxx | 19 ----------- 22 files changed, 149 deletions(-)
New commits: commit 2384755ca8688a99ab9c0b0907123632aca6471b Author: Michael Weghorn <[email protected]> AuthorDate: Mon Mar 31 14:36:17 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Apr 1 11:20:32 2025 +0200 a11y: Drop unnecessary XAccessibleExtendedComponent overrides Drop overrides of the XAccessibleExtendedComponent which just return an empty string. That is now already implemented in the base class implementations in OAccessibleComponentHelper, see Change-Id: I05547b12806a6a90b166edbe196b4bc5a27344be Author: Michael Weghorn <[email protected]> Date: Mon Mar 31 13:49:20 2025 +0200 a11y: Merge OAccessible{,Extended}ComponentHelper, add default impl Change-Id: Ibc3fe295eaa2dc5443ba4f8fa25a81451b7b3765 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183553 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 576e83201988..cee0ed688bad 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -481,14 +481,6 @@ sal_Int32 AccessibleDialogControlShape::getBackground( ) // XAccessibleExtendedComponent -OUString AccessibleDialogControlShape::getTitledBorderText( ) -{ - OExternalLockGuard aGuard( this ); - - return OUString(); -} - - OUString AccessibleDialogControlShape::getToolTipText( ) { OExternalLockGuard aGuard( this ); diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index cac079c139e5..aa6654b29a92 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -744,14 +744,6 @@ sal_Int32 AccessibleDialogWindow::getBackground( ) // XAccessibleExtendedComponent -OUString AccessibleDialogWindow::getTitledBorderText( ) -{ - OExternalLockGuard aGuard( this ); - - return OUString(); -} - - OUString AccessibleDialogWindow::getToolTipText( ) { OExternalLockGuard aGuard( this ); diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index 085b8c013ec6..e4423b34b7ed 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -110,7 +110,6 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual OUString SAL_CALL getTitledBorderText( ) override; virtual OUString SAL_CALL getToolTipText( ) override; }; diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index ae68ffdf043a..357485d2add5 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -124,7 +124,6 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual OUString SAL_CALL getTitledBorderText( ) override; virtual OUString SAL_CALL getToolTipText( ) override; // XAccessibleSelection diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index f31f716e4b94..8554096c171c 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -685,16 +685,6 @@ Color AccessibleBase::getColor( eColorType eColType ) return nResult; } -OUString SAL_CALL AccessibleBase::getTitledBorderText() -{ - return OUString(); -} - -OUString SAL_CALL AccessibleBase::getToolTipText() -{ - return OUString(); -} - // ________ AccessibleBase::XServiceInfo ________ OUString SAL_CALL AccessibleBase::getImplementationName() { diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index fe3b0cbda708..596a5577c510 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -224,10 +224,6 @@ protected: virtual sal_Int32 SAL_CALL getForeground() override; virtual sal_Int32 SAL_CALL getBackground() override; - // XAccessibleExtendedComponent - virtual OUString SAL_CALL getTitledBorderText() override; - virtual OUString SAL_CALL getToolTipText() override; - // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index a08597860972..6841e7edfa36 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -349,21 +349,6 @@ 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() { diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index 8a64472bde38..7e362e5e0257 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -217,10 +217,6 @@ public: */ virtual sal_Int32 SAL_CALL getBackground() override; - //===== XAccessibleExtendedComponent ==================================== - virtual OUString SAL_CALL getTitledBorderText() override; - virtual OUString SAL_CALL getToolTipText() override; - //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. diff --git a/svtools/source/control/accessibletabbarpage.cxx b/svtools/source/control/accessibletabbarpage.cxx index 9a08c3d58c52..36304a0d0292 100644 --- a/svtools/source/control/accessibletabbarpage.cxx +++ b/svtools/source/control/accessibletabbarpage.cxx @@ -380,12 +380,6 @@ namespace accessibility } - OUString AccessibleTabBarPage::getToolTipText( ) - { - return OUString(); - } - - } // namespace accessibility diff --git a/svtools/source/control/accessibletabbarpage.hxx b/svtools/source/control/accessibletabbarpage.hxx index cd770913b1f5..cf0202797c27 100644 --- a/svtools/source/control/accessibletabbarpage.hxx +++ b/svtools/source/control/accessibletabbarpage.hxx @@ -94,7 +94,6 @@ namespace accessibility // XAccessibleExtendedComponent virtual OUString SAL_CALL getTitledBorderText( ) override; - virtual OUString SAL_CALL getToolTipText( ) override; }; diff --git a/svtools/source/control/accessibletabbarpagelist.cxx b/svtools/source/control/accessibletabbarpagelist.cxx index 583ed79b45f8..b70a77dc8a9c 100644 --- a/svtools/source/control/accessibletabbarpagelist.cxx +++ b/svtools/source/control/accessibletabbarpagelist.cxx @@ -542,21 +542,6 @@ namespace accessibility return nColor; } - - // XAccessibleExtendedComponent - - OUString AccessibleTabBarPageList::getTitledBorderText( ) - { - return OUString(); - } - - - OUString AccessibleTabBarPageList::getToolTipText( ) - { - return OUString(); - } - - // XAccessibleSelection diff --git a/svtools/source/control/accessibletabbarpagelist.hxx b/svtools/source/control/accessibletabbarpagelist.hxx index 47190eb88a9d..63f51a0314a9 100644 --- a/svtools/source/control/accessibletabbarpagelist.hxx +++ b/svtools/source/control/accessibletabbarpagelist.hxx @@ -90,10 +90,6 @@ namespace accessibility virtual sal_Int32 SAL_CALL getForeground( ) override; virtual sal_Int32 SAL_CALL getBackground( ) override; - // XAccessibleExtendedComponent - virtual OUString SAL_CALL getTitledBorderText( ) override; - virtual OUString SAL_CALL getToolTipText( ) override; - // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override; diff --git a/vcl/inc/accessibility/accessiblemenucomponent.hxx b/vcl/inc/accessibility/accessiblemenucomponent.hxx index 9ce531731bd9..87ae918996f5 100644 --- a/vcl/inc/accessibility/accessiblemenucomponent.hxx +++ b/vcl/inc/accessibility/accessiblemenucomponent.hxx @@ -60,10 +60,6 @@ public: virtual sal_Int32 SAL_CALL getForeground( ) override; virtual sal_Int32 SAL_CALL getBackground( ) override; - // XAccessibleExtendedComponent - virtual OUString SAL_CALL getTitledBorderText( ) override; - virtual OUString SAL_CALL getToolTipText( ) override; - // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override; diff --git a/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx b/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx index 2bd5405d1e91..63a19d2c658a 100644 --- a/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx +++ b/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx @@ -78,7 +78,6 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual OUString SAL_CALL getTitledBorderText( ) override; virtual OUString SAL_CALL getToolTipText( ) override; }; diff --git a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx index 25e5460d7972..2192dac2918b 100644 --- a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx +++ b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx @@ -79,7 +79,6 @@ public: virtual sal_Int32 SAL_CALL getBackground() override; // XAccessibleExtendedComponent - virtual OUString SAL_CALL getTitledBorderText( ) override; virtual OUString SAL_CALL getToolTipText( ) override; }; diff --git a/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx b/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx index 4b8f3e57b24d..fe7c7178ddc5 100644 --- a/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx +++ b/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx @@ -93,7 +93,6 @@ public: // XAccessibleExtendedComponent virtual OUString SAL_CALL getTitledBorderText( ) override; - virtual OUString SAL_CALL getToolTipText( ) override; // XAccessibleText virtual sal_Int32 SAL_CALL getCaretPosition() override; diff --git a/vcl/inc/accessibility/vclxaccessibletabpage.hxx b/vcl/inc/accessibility/vclxaccessibletabpage.hxx index 7ec48b3084bd..b766e39052fe 100644 --- a/vcl/inc/accessibility/vclxaccessibletabpage.hxx +++ b/vcl/inc/accessibility/vclxaccessibletabpage.hxx @@ -101,10 +101,6 @@ public: virtual sal_Int32 SAL_CALL getForeground( ) override; virtual sal_Int32 SAL_CALL getBackground( ) override; - // XAccessibleExtendedComponent - virtual OUString SAL_CALL getTitledBorderText( ) override; - virtual OUString SAL_CALL getToolTipText( ) override; - // XAccessibleText virtual OUString SAL_CALL getText() override; virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; diff --git a/vcl/source/accessibility/accessiblemenucomponent.cxx b/vcl/source/accessibility/accessiblemenucomponent.cxx index fd70b8554190..0b52ac4597a9 100644 --- a/vcl/source/accessibility/accessiblemenucomponent.cxx +++ b/vcl/source/accessibility/accessiblemenucomponent.cxx @@ -268,25 +268,6 @@ sal_Int32 OAccessibleMenuComponent::getBackground( ) return 0; } - -// XAccessibleExtendedComponent - -OUString OAccessibleMenuComponent::getTitledBorderText( ) -{ - OExternalLockGuard aGuard( this ); - - return OUString(); -} - - -OUString OAccessibleMenuComponent::getToolTipText( ) -{ - OExternalLockGuard aGuard( this ); - - return OUString(); -} - - // XAccessibleSelection diff --git a/vcl/source/accessibility/accessiblemenuitemcomponent.cxx b/vcl/source/accessibility/accessiblemenuitemcomponent.cxx index 9723f37f87c3..1ac40c686feb 100644 --- a/vcl/source/accessibility/accessiblemenuitemcomponent.cxx +++ b/vcl/source/accessibility/accessiblemenuitemcomponent.cxx @@ -417,14 +417,6 @@ sal_Int32 OAccessibleMenuItemComponent::getBackground( ) // XAccessibleExtendedComponent -OUString OAccessibleMenuItemComponent::getTitledBorderText( ) -{ - OExternalLockGuard aGuard( this ); - - return OUString(); -} - - OUString OAccessibleMenuItemComponent::getToolTipText( ) { OExternalLockGuard aGuard( this ); diff --git a/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx b/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx index c0a7e346174d..8f2bdc0018d7 100644 --- a/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx +++ b/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx @@ -227,12 +227,6 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() // XAccessibleExtendedComponent -OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() -{ - return OUString(); -} - - OUString VCLXAccessibleHeaderBarItem::getToolTipText() { OExternalLockGuard aGuard( this ); diff --git a/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx b/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx index e87e88273eca..8cf1a648976f 100644 --- a/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx +++ b/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx @@ -385,15 +385,6 @@ OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) return GetItemText(); } - -OUString VCLXAccessibleStatusBarItem::getToolTipText( ) -{ - OExternalLockGuard aGuard( this ); - - return OUString(); -} - - // XAccessibleText OUString VCLXAccessibleStatusBarItem::getText() diff --git a/vcl/source/accessibility/vclxaccessibletabpage.cxx b/vcl/source/accessibility/vclxaccessibletabpage.cxx index 7b10582a7213..17f0986c39a2 100644 --- a/vcl/source/accessibility/vclxaccessibletabpage.cxx +++ b/vcl/source/accessibility/vclxaccessibletabpage.cxx @@ -466,25 +466,6 @@ sal_Int32 VCLXAccessibleTabPage::getBackground( ) return nColor; } - -// XAccessibleExtendedComponent - -OUString VCLXAccessibleTabPage::getTitledBorderText( ) -{ - OExternalLockGuard aGuard( this ); - - return OUString(); -} - - -OUString VCLXAccessibleTabPage::getToolTipText( ) -{ - OExternalLockGuard aGuard( this ); - - return OUString(); -} - - // XAccessibleText OUString VCLXAccessibleTabPage::getText()
