diff options
author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-06 10:45:30 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-07 12:34:16 +0000 |
commit | 67dab7c4b851573747e41def560e26dacdb8ceac (patch) | |
tree | bcef7670730c435c838eb72b4b9894a9b162563a | |
parent | f18882b8a75017295c10fec276aa4488aa2af45a (diff) |
fdo#39944: improve mapping between ATK and UNO roles
* UNO role GROUP_BOX was not mapped to any ATK role, now it's mapped
to ATK_ROLE_GROUPING.
* UNO role COMMENT was mapped to ATK_ROLE_SCROLL_PANE, we replaced it
with ATK_ROLE_COMMENT.
We use registerRole method to map these instead of doing a direct
association to prevent a failure in case the installed version of ATK
doesn't contain these roles.
(cherry-picked from e031c8ae1ac046fcf165213d80e83311d80a71f5 to
address fdo#77682)
Change-Id: I7e266a7e92d59b282c51934df05b53414588cc7e
Reviewed-on: https://gerrit.libreoffice.org/9267
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | vcl/unx/gtk/a11y/atkwrapper.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index a87fe6ce1c30..a568953275dc 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -287,11 +287,12 @@ static AtkRole mapToAtkRole( sal_Int16 nRole ) roleMap[accessibility::AccessibleRole::PAGE] = registerRole("page"); roleMap[accessibility::AccessibleRole::SECTION] = registerRole("section"); roleMap[accessibility::AccessibleRole::FORM] = registerRole("form"); + roleMap[accessibility::AccessibleRole::GROUP_BOX] = registerRole("grouping"); + roleMap[accessibility::AccessibleRole::COMMENT] = registerRole("comment"); // these don't exist in ATK yet roleMap[accessibility::AccessibleRole::END_NOTE] = registerRole("end note"); roleMap[accessibility::AccessibleRole::FOOTNOTE] = registerRole("foot note"); - roleMap[accessibility::AccessibleRole::GROUP_BOX] = registerRole("group box"); roleMap[accessibility::AccessibleRole::HYPER_LINK] = registerRole("hyper link"); roleMap[accessibility::AccessibleRole::SHAPE] = registerRole("shape"); roleMap[accessibility::AccessibleRole::TEXT_FRAME] = registerRole("text frame"); |