[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/window/menufloatingwindow.cxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit f6d0d92a5e249413df99a7f3677a28efe6d45426
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 2 13:08:39 2016 +0100

    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

diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 022eac2..6506704 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 )
                 {