Related: tdf#101881 keys not handled by native menubar sent to vcl one

so 'o' pops up native menu, shift+o is unhandled by native, sent to
vcl one which pops up some shoddy emulated version of the o menu

Change-Id: Id6b0d27dd81f8a6d141cef79cc4825703c923636
Reviewed-on: https://gerrit.libreoffice.org/42538
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 58d97a1fba8f..647eac636494 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -693,6 +693,12 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu )
         }
     }
 
+    // no key events if native menus
+    if (pMenu->ImplGetSalMenu() && pMenu->ImplGetSalMenu()->VisibleMenuBar())
+    {
+        return false;
+    }
+
     if ( nCode == KEY_MENU && !rKEvent.GetKeyCode().IsShift() ) // only F10, not Shift-F10
     {
         mbAutoPopup = ImplGetSVData()->maNWFData.mbOpenMenuOnF10;