include/vcl/weld.hxx | 2 +-
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 2 +-
svtools/source/control/valueacc.cxx | 2 +-
vcl/inc/salvtables.hxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/unx/gtk3/gtk3gtkinst.cxx | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 87bd31e28cb0688acb2d05f99daeea038bfe38fc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Apr 23 14:26:27 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Apr 23 18:20:07 2021 +0200
we want the a11y screen location
gen uses the absolute screen position so that's what's expected
Change-Id: I4f51c272a49a640e0a387bc123b2cc17ea430d6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114551
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 31b90880c8d1..26e7f32618f0 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2210,7 +2210,7 @@ public:
virtual a11yref get_accessible_parent() = 0;
virtual a11yrelationset get_accessible_relation_set() = 0;
- virtual Point get_accessible_location() = 0;
+ virtual Point get_accessible_location_on_screen() = 0;
private:
friend class ::LOKTrigger;
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index d416b452ddfa..f9e792298c80 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -542,7 +542,7 @@ tools::Rectangle
ScAccessibleEditControlObject::GetBoundingBoxOnScreen() const
if (m_pController && m_pController->GetDrawingArea())
{
- aScreenBounds =
tools::Rectangle(m_pController->GetDrawingArea()->get_accessible_location(),
+ aScreenBounds =
tools::Rectangle(m_pController->GetDrawingArea()->get_accessible_location_on_screen(),
m_pController->GetOutputSizePixel());
}
diff --git a/svtools/source/control/valueacc.cxx
b/svtools/source/control/valueacc.cxx
index 59b45df8d987..76fd5f4cf83b 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -352,7 +352,7 @@ awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen()
if( mpParent )
{
const Point aPos =
mpParent->mrParent.GetItemRect(mpParent->mnId).TopLeft();
- const Point aScreenPos(
mpParent->mrParent.GetDrawingArea()->get_accessible_location() );
+ const Point
aScreenPos(mpParent->mrParent.GetDrawingArea()->get_accessible_location_on_screen());
aRet.X = aPos.X() + aScreenPos.X();
aRet.Y = aPos.Y() + aScreenPos.Y();
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index b0c04b5b1f0b..7f51cf5b6636 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1164,7 +1164,7 @@ public:
virtual a11yrelationset get_accessible_relation_set() override;
- virtual Point get_accessible_location() override;
+ virtual Point get_accessible_location_on_screen() override;
virtual void enable_drag_source(rtl::Reference<TransferDataContainer>&
rHelper,
sal_uInt8 eDNDConstants) override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index eb45ba39adbd..7d9be3193c52 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5980,7 +5980,7 @@ a11yrelationset
SalInstanceDrawingArea::get_accessible_relation_set()
return pRelationSetHelper;
}
-Point SalInstanceDrawingArea::get_accessible_location()
+Point SalInstanceDrawingArea::get_accessible_location_on_screen()
{
return m_xDrawingArea->OutputToAbsoluteScreenPixel(Point());
}
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 9d510da1838c..9d408680c98b 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -14032,12 +14032,12 @@ public:
return uno::Reference<css::accessibility::XAccessibleRelationSet>();
}
- virtual Point get_accessible_location() override
+ virtual Point get_accessible_location_on_screen() override
{
AtkObject* pAtkObject = default_drawing_area_get_accessible(m_pWidget);
gint x(0), y(0);
if (pAtkObject && ATK_IS_COMPONENT(pAtkObject))
- atk_component_get_extents(ATK_COMPONENT(pAtkObject), &x, &y,
nullptr, nullptr, ATK_XY_WINDOW);
+ atk_component_get_extents(ATK_COMPONENT(pAtkObject), &x, &y,
nullptr, nullptr, ATK_XY_SCREEN);
return Point(x, y);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
