[Libreoffice-commits] core.git: vcl/unx

[Jacobo Aragunde Pérez]

 vcl/unx/gtk/a11y/atkwrapper.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e031c8ae1ac046fcf165213d80e83311d80a71f5
Author: Jacobo Aragunde Pérez <jaragunde at igalia.com>
Date:   Mon Feb 3 15:59:57 2014 +0100

    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.
    
    Change-Id: I7e266a7e92d59b282c51934df05b53414588cc7e

diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index ac5075b..e45add2 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -298,11 +298,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");