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

[Noel Grandin (via logerrit)]

 vcl/unx/gtk3/a11y/atkaction.cxx |   16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

New commits:
commit a1dd01fd8c2ec5ec320f093da18f99186fb3031f
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Nov 9 14:07:45 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Nov 9 14:50:21 2021 +0100

    simplify init in action_wrapper_get_name
    
    Change-Id: Ie73f5fc096b918a7cb8a9342b33fab60806c77b6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124913
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/unx/gtk3/a11y/atkaction.cxx b/vcl/unx/gtk3/a11y/atkaction.cxx
index 84770c09cfe9..0a39d3bdf98e 100644
--- a/vcl/unx/gtk3/a11y/atkaction.cxx
+++ b/vcl/unx/gtk3/a11y/atkaction.cxx
@@ -113,21 +113,15 @@ action_wrapper_get_localized_name (AtkAction *, gint)
     return "";
 }
 
-#define ACTION_NAME_PAIR( OOoName, AtkName ) \
-    std::pair< const OUString, const gchar * > ( OUString( OOoName ), AtkName )
-
 static const gchar *
 action_wrapper_get_name (AtkAction *action,
                          gint       i)
 {
-    static std::map< OUString, const gchar * > aNameMap;
-
-    if( aNameMap.empty() )
-    {
-        aNameMap.insert( ACTION_NAME_PAIR( "click", "click" ) );
-        aNameMap.insert( ACTION_NAME_PAIR( "select", "click" ) );
-        aNameMap.insert( ACTION_NAME_PAIR( "togglePopup", "push" ) );
-    }
+    static std::map< OUString, const gchar * > aNameMap {
+        { "click", "click" },
+        { "select", "click" } ,
+        { "togglePopup", "push" }
+    };
 
     try {
         css::uno::Reference<css::accessibility::XAccessibleAction> pAction