From 448636b0c493ce8732d4d7e39dcce7337d342e28 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 2 Aug 2016 13:08:39 +0100 Subject: 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) (cherry picked from commit f6d0d92a5e249413df99a7f3677a28efe6d45426) Change-Id: Ib7a99bd9039cd07120b3b77380f810b5b028fd57 Reviewed-on: https://gerrit.libreoffice.org/27795 Tested-by: Jenkins Reviewed-by: Miklos Vajna (cherry picked from commit 1288a0682ab4c960915722d2bb52a200e75580a3) --- vcl/source/window/menufloatingwindow.cxx | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'vcl/source/window') diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 1cb95ed18f87..b6d6c966ded2 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -1112,18 +1112,9 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent ) sal_Unicode nCharCode = rKEvent.GetCharCode(); sal_uInt16 nPos = 0; sal_uInt16 nDuplicates = 0; - MenuItemData* pData = (nCharCode && pMenu) ? + MenuItemData* pData = (nCharCode && pMenu && ImplGetSVData()->maNWFData.mbEnableAccel) ? 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(men->pWindow.get()))->GetMBWMenuKey(); - } - if (bConsume) + if (pData) { if ( pData->pSubMenu || nDuplicates > 1 ) { -- cgit v1.2.3