summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJacobo Aragunde Pérez <jaragunde@igalia.com>2014-07-03 20:13:51 +0200
committerAndras Timar <andras.timar@collabora.com>2014-07-04 11:33:55 +0200
commiteca34a44bf3a697b4e113467750b4777f0cf46a6 (patch)
tree1cf3cbda202fb58718abc336b62c88b493049efe /vcl
parent3c0872cb375b9e3587a1a8e995827d34202214ce (diff)
fdo#39944: Fix mapping for some a11y roles to ATK
In particular, EDIT_BAR, EMBEDDED_OBJECT and HYPER_LINK were being mapped to custom roles when specific roles exist; fixed passing the proper name to registerRole. Besides, moved two roles that were in the section 'don't exist in ATK yet' because that's not the case now. Change-Id: I6818a0ac623f45053812b5c6dd5fc25c9abf4f65 (cherry picked from commit 7c37cd7bb26b91bda5e57d7bd0cecdbc9d1ebb22) Reviewed-on: https://gerrit.libreoffice.org/10068 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index b93f6eb3ddd9..5336f48495ae 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -289,8 +289,8 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
if( ! initialized )
{
// re-use strings from ATK library
- roleMap[accessibility::AccessibleRole::EDIT_BAR] = registerRole("edit bar");
- roleMap[accessibility::AccessibleRole::EMBEDDED_OBJECT] = registerRole("embedded component");
+ roleMap[accessibility::AccessibleRole::EDIT_BAR] = registerRole("editbar");
+ roleMap[accessibility::AccessibleRole::EMBEDDED_OBJECT] = registerRole("embedded");
roleMap[accessibility::AccessibleRole::CHART] = registerRole("chart");
roleMap[accessibility::AccessibleRole::CAPTION] = registerRole("caption");
roleMap[accessibility::AccessibleRole::DOCUMENT] = registerRole("document frame");
@@ -300,16 +300,16 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
roleMap[accessibility::AccessibleRole::FORM] = registerRole("form");
roleMap[accessibility::AccessibleRole::GROUP_BOX] = registerRole("grouping");
roleMap[accessibility::AccessibleRole::COMMENT] = registerRole("comment");
+ roleMap[accessibility::AccessibleRole::IMAGE_MAP] = registerRole("image map");
+ roleMap[accessibility::AccessibleRole::TREE_ITEM] = registerRole("tree item");
+ roleMap[accessibility::AccessibleRole::HYPER_LINK] = registerRole("link");
// 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::HYPER_LINK] = registerRole("hyper link");
roleMap[accessibility::AccessibleRole::SHAPE] = registerRole("shape");
roleMap[accessibility::AccessibleRole::TEXT_FRAME] = registerRole("text frame");
- roleMap[accessibility::AccessibleRole::IMAGE_MAP] = registerRole("image map");
roleMap[accessibility::AccessibleRole::NOTE] = registerRole("note");
- roleMap[accessibility::AccessibleRole::TREE_ITEM] = registerRole("tree item");
initialized = true;
}