[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua

[Boris Dušek]

 vcl/aqua/source/a11y/aqua11ywrapper.mm |   23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 30d96626c51282b172a3c3f48f8b01ee137dfd08
Author: Boris Dušek <me at dusek.me>
Date:   Fri Aug 2 00:20:57 2013 +0200

    Use NSAccessibilityActionDescription for action descriptions
    
    Reviewed-on: https://gerrit.libreoffice.org/5238
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
    
    Conflicts:
    	vcl/aqua/source/a11y/aqua11ywrapper.mm
    
    Change-Id: I26a233e72274be7afc2e3e41e13a6743f75e695f
    Reviewed-on: https://gerrit.libreoffice.org/5493
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index 04c29ad..9a35cbc 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -880,29 +880,8 @@ static BOOL isPopupMenuOpen = NO;
     return self;
 }
 
-// TODO: hard-coded like the role descriptions. is there a better way?
 -(NSString *)accessibilityActionDescription:(NSString *)action {
-    if ( [ action isEqualToString: NSAccessibilityConfirmAction ] ) {
-        return @"confirm";
-    } else if ( [ action isEqualToString: NSAccessibilityDecrementAction ] ) {
-        return @"decrement";
-    } else if ( [ action isEqualToString: NSAccessibilityDeleteAction ] ) {
-        return @"delete";
-    } else if ( [ action isEqualToString: NSAccessibilityIncrementAction ] ) {
-        return @"increment";
-    } else if ( [ action isEqualToString: NSAccessibilityPickAction ] ) {
-        return @"pick";
-    } else if ( [ action isEqualToString: NSAccessibilityPressAction ] ) {
-        return @"press";
-    } else if ( [ action isEqualToString: NSAccessibilityCancelAction ] ) {
-        return @"cancel";
-    } else if ( [ action isEqualToString: NSAccessibilityRaiseAction ] ) {
-        return @"raise";
-    } else if ( [ action isEqualToString: NSAccessibilityShowMenuAction ] ) {
-        return @"show menu";
-    } else {
-        return [ NSString string ];
-    }
+    return NSAccessibilityActionDescription(action);
 }
 
 -(AquaA11yWrapper *)actionResponder {