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

[Jacobo Aragunde Pérez]

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

New commits:
commit 67dab7c4b851573747e41def560e26dacdb8ceac
Author: Jacobo Aragunde Pérez <jaragunde at igalia.com>
Date:   Tue May 6 10:45:30 2014 +0200

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index a87fe6c..a568953 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");