[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/osx

[Maxim Monastirsky]

 vcl/osx/vclnsapp.mm |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3b457cb8825882cadec44e0b0679d1e70051eb71
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Feb 8 01:47:46 2018 +0200

    tdf#100784 macOS: Don't attempt to handle shortcuts via the menubar
    
    ... when it's hidden.
    
    Change-Id: I7930afb8124dd552843512cd30bce4d82ade0c70
    Reviewed-on: https://gerrit.libreoffice.org/49399
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    (cherry picked from commit 9d77e7551e56b85d7f1b40bc42b9ba6876091f22)
    Reviewed-on: https://gerrit.libreoffice.org/49707
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index a4f00e32c4f0..09c3a8001f2d 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -160,7 +160,8 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
             // the main menu just beeps for an unknown or disabled key equivalent
             // and swallows the event wholesale
             NSMenu* pMainMenu = [NSApp mainMenu];
-            if( ! bHandled && (pMainMenu == nullptr || ! [pMainMenu performKeyEquivalent: pEvent]) )
+            if( ! bHandled &&
+                (pMainMenu == nullptr || ! [NSMenu menuBarVisible] || ! [pMainMenu performKeyEquivalent: pEvent]) )
             {
                 [[pKeyWin contentView] keyDown: pEvent];
                 bHandled = GetSalData()->maKeyEventAnswer[ pEvent ];