From 70003dfd3e891a3bbefe571375fba08ea4960995 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Sat, 19 Sep 2026 12:36:42 +0200 Subject: [PATCH] a11y: Use OAccessible in ScAccessibleDocumentPagePreview::getAccessibleAtPoint Use the more concrete OAccessible for the local variable in ScAccessibleDocumentPagePreview::getAccessibleAtPoint instead of the abstract XAccessible UNO interface. Change-Id: I4a0df2d86fea83cb9524b61242781c8ae01fed2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211208 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- .../AccessibleDocumentPagePreview.cxx | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 697b3835d02e..1d36d5a38830 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1246,7 +1246,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleAtPoint( const awt::Point& rPoint ) { - uno::Reference xAccessible; + rtl::Reference pAccessible; if (containsPoint(rPoint)) { SolarMutexGuard aGuard; @@ -1254,8 +1254,8 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces if ( mpViewShell ) { - xAccessible = GetShapeChildren()->GetForegroundShapeAt(rPoint); - if (!xAccessible.is()) + pAccessible = GetShapeChildren()->GetForegroundShapeAt(rPoint); + if (!pAccessible.is()) { const ScPreviewLocationData& rData = mpViewShell->GetLocationData(); ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChildren(), GetShapeChildren() ); @@ -1271,11 +1271,11 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces if (mpTable.is() && vcl::unohelper::ConvertToVCLRect(mpTable->getBounds()) .Contains(vcl::unohelper::ConvertToVCLPoint(rPoint))) - xAccessible = mpTable.get(); + pAccessible = mpTable.get(); } - if (!xAccessible.is()) - xAccessible = GetNotesChildren()->GetAt(rPoint); - if (!xAccessible.is()) + if (!pAccessible.is()) + pAccessible = GetNotesChildren()->GetAt(rPoint); + if (!pAccessible.is()) { if (!mpHeader.is() || !mpFooter.is()) { @@ -1295,16 +1295,16 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces Point aPoint(vcl::unohelper::ConvertToVCLPoint(rPoint)); if (vcl::unohelper::ConvertToVCLRect(mpHeader->getBounds()).Contains(aPoint)) - xAccessible = mpHeader.get(); + pAccessible = mpHeader.get(); else if (vcl::unohelper::ConvertToVCLRect(mpFooter->getBounds()).Contains(aPoint)) - xAccessible = mpFooter.get(); + pAccessible = mpFooter.get(); } - if (!xAccessible.is()) - xAccessible = GetShapeChildren()->GetBackgroundShapeAt(rPoint); + if (!pAccessible.is()) + pAccessible = GetShapeChildren()->GetBackgroundShapeAt(rPoint); } } - return xAccessible; + return pAccessible; } void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus()