diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-02 13:08:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-02 13:17:05 +0100 |
| commit | f6d0d92a5e249413df99a7f3677a28efe6d45426 (patch) | |
| tree | c74b5f2770be9fd0816434c318731e88ec6dbe4e | |
| parent | 0762a119fc0a17b80dab1e49fb832a2214f85fdc (diff) | |
Related: tdf#92516 make menu accelerators always work even if...
keyboard not used yet.
The gtk2/3 menus appear to work this way. (And when not in gtk2/3
it shouldn't disable the accelerators for other platforms anyway)
Change-Id: Ib7a99bd9039cd07120b3b77380f810b5b028fd57
| -rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 022eac2e4123..6506704da53a 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -1104,16 +1104,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent ) sal_uInt16 nDuplicates = 0; MenuItemData* pData = (nCharCode && pMenu) ? pMenu->GetItemList()->SearchItem(nCharCode, rKEvent.GetKeyCode(), nPos, nDuplicates, nHighlightedItem) : nullptr; - bool bConsume = false; - bool accel = ImplGetSVData()->maNWFData.mbEnableAccel; - if (pData && accel) - { - Menu *men = pMenu; - while (men && !men->IsMenuBar()) - men = men->pStartedFrom; - bConsume = !men || (static_cast<MenuBarWindow*>(men->pWindow.get()))->GetMBWMenuKey(); - } - if (bConsume) + if (pData) { if ( pData->pSubMenu || nDuplicates > 1 ) { |