ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

a11y: Use OAccessible in ScAccessibleDocumentPagePreview::getAccessibleAtPoint

Browse Source 
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 <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-09-20 22:18:03 +02:00
parent 36f1906093
commit 70003dfd3e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+12 -12
View File
@@ -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> xAccessible;
rtl::Reference<comphelper::OAccessible> 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()