[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - vcl/unx

[Jacobo Aragunde Pérez]

 vcl/unx/gtk/a11y/atkwrapper.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2a356a1a3fb89fb737ad02d7f864e521cb954a8a
Author: Jacobo Aragunde Pérez <jaragu...@igalia.com>
Date:   Thu Jul 3 20:13:51 2014 +0200

    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/10067
    Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index f3ef8d5..a30bf16 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -291,8 +291,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");
@@ -302,16 +302,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;
     }

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits