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

Julien Nabet serval2412 at yahoo.fr
Thu Aug 14 08:06:39 PDT 2014


 vcl/aqua/source/window/salframe.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4928dde73ca036e6337eb089faca3c8c2c93445
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Aug 12 21:43:45 2014 +0200

    fdo#39477: Mac Keyboard shortcut Option key ko in Customize dialog
    
    (+ fdo#49280)
    I couldn't cherry-pick directly since the arbo is different between 4.2 and 4.3+
    Indeed vcl/aqua is now vcl/osx
    
    Change-Id: I45a834c5ec1e4c4c5c4fd6960b48963df5656a7e
    Reviewed-on: https://gerrit.libreoffice.org/10898
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 523fbda..6eb9ba25 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1110,7 +1110,7 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
         // we do not really handle Alt (see below)
         // we map it to MOD3, whichis actually Command
         if( (nKeyCode & (KEY_MOD2|KEY_MOD3)) != 0 )
-            aResult.append( sal_Unicode( 0x2303 ) );
+            aResult.append( sal_Unicode( 0x2325 ) );
 
         aResult.append( it->second );
     }


More information about the Libreoffice-commits mailing list