sc/source/ui/Accessibility/AccessibleContextBase.cxx | 32 ------------------- sc/source/ui/inc/AccessibleContextBase.hxx | 15 +------- 2 files changed, 2 insertions(+), 45 deletions(-)
New commits: commit b7c3beb429dfca11786655bbba58c0faab3b6e87 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sat Mar 15 16:14:43 2025 -0700 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Sun Mar 16 03:08:10 2025 +0100 sc a11y: Leave some methods purely virtual in base class Instead of having dummy implementations that `OSL_FAIL` in the ScAccessibleContextBase base class, leave them purely virtual there; they're overriden in subclasses. Change-Id: I038c4ffd09f1fcc5e31b2e01eec01fd3e4bf09dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182981 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index b121893e2f6c..95eb844b4ad8 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -162,13 +162,6 @@ sal_Bool SAL_CALL ScAccessibleContextBase::containsPoint(const awt::Point& rPoin .Contains(vcl::unohelper::ConvertToVCLPoint(rPoint)); } -uno::Reference< XAccessible > SAL_CALL ScAccessibleContextBase::getAccessibleAtPoint( - const awt::Point& /* rPoint */ ) -{ - OSL_FAIL("not implemented"); - return uno::Reference<XAccessible>(); -} - awt::Rectangle SAL_CALL ScAccessibleContextBase::getBounds( ) { SolarMutexGuard aGuard; @@ -238,19 +231,6 @@ sal_Int32 SAL_CALL ScAccessibleContextBase::getBackground( ) //===== XAccessibleContext ================================================== -sal_Int64 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount() -{ - OSL_FAIL("should be implemented in the abrevated class"); - return 0; -} - -uno::Reference<XAccessible> SAL_CALL - ScAccessibleContextBase::getAccessibleChild(sal_Int64 /* nIndex */) -{ - OSL_FAIL("should be implemented in the abrevated class"); - return uno::Reference<XAccessible>(); -} - uno::Reference<XAccessible> SAL_CALL ScAccessibleContextBase::getAccessibleParent() { @@ -474,18 +454,6 @@ void ScAccessibleContextBase::CommitFocusLost() const CommitChange(aEvent); } -AbsoluteScreenPixelRectangle ScAccessibleContextBase::GetBoundingBoxOnScreen() const -{ - OSL_FAIL("not implemented"); - return AbsoluteScreenPixelRectangle(); -} - -tools::Rectangle ScAccessibleContextBase::GetBoundingBox() const -{ - OSL_FAIL("not implemented"); - return tools::Rectangle(); -} - void ScAccessibleContextBase::IsObjectValid() const { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index d683dee6c2d2..50172f232626 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -88,10 +88,6 @@ public: virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) override; - virtual css::uno::Reference< css::accessibility::XAccessible > - SAL_CALL getAccessibleAtPoint( - const css::awt::Point& rPoint ) override; - virtual css::awt::Rectangle SAL_CALL getBounds( ) override; virtual css::awt::Point SAL_CALL getLocation( ) override; @@ -108,13 +104,6 @@ public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. - virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; - - /// Return the specified child or NULL if index is invalid. - virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild(sal_Int64 nIndex) override; - /// Return a reference to the parent. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override; @@ -196,12 +185,12 @@ protected: /// Return the object's current bounding box relative to the desktop. /// /// @throws css::uno::RuntimeException - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const = 0; /// Return the object's current bounding box relative to the parent object. /// /// @throws css::uno::RuntimeException - virtual tools::Rectangle GetBoundingBox() const; + virtual tools::Rectangle GetBoundingBox() const = 0; public: /// Calls all Listener to tell they the change.