[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/source

[Caolán McNamara]

 vcl/source/window/dialog.cxx |    2 +-
 vcl/source/window/menu.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0d8746c091ce3e70340c431da8d35d453d2b3b2c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 9 10:26:05 2017 +0000

    Resolves: tdf#101972 skip invalidating labels on alt if autoaccel is disabled
    
    so no Invalidate will be called if auto accelerators are not enabled
    so there should be no blinking under windows
    
    (cherry picked from commit f67dc04cfdd9e63a45ec6c8bc00829bce8f17d4b)
    
    Change-Id: Iccc5dad7af41f39ac02d3be93e935f2d926a82a6
    Reviewed-on: https://gerrit.libreoffice.org/34077
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e160322..2cebcb1 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -598,7 +598,7 @@ IMPL_LINK_NOARG_TYPED(Dialog, ImplAsyncCloseHdl, void*, void)
 
 bool Dialog::ImplHandleCmdEvent( const CommandEvent& rCEvent )
 {
-    if (rCEvent.GetCommand() == CommandEventId::ModKeyChange)
+    if (rCEvent.GetCommand() == CommandEventId::ModKeyChange && ImplGetSVData()->maNWFData.mbAutoAccel)
     {
         const CommandModKeyData *pCData = rCEvent.GetModKeyData ();
         bool bShowAccel =  pCData && pCData->IsMod2();
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index a647e88..d7f6b08 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2570,7 +2570,7 @@ bool MenuBar::ImplHandleCmdEvent( const CommandEvent& rCEvent )
     MenuBarWindow* pWin = static_cast<MenuBarWindow*>(ImplGetWindow());
     if ( pWin && pWin->IsEnabled() && pWin->IsInputEnabled()  && ! pWin->IsInModalMode() )
     {
-        if (rCEvent.GetCommand() == CommandEventId::ModKeyChange)
+        if (rCEvent.GetCommand() == CommandEventId::ModKeyChange && ImplGetSVData()->maNWFData.mbAutoAccel)
         {
             const CommandModKeyData* pCData = rCEvent.GetModKeyData ();
             if (pWin->nHighlightedItem == ITEMPOS_INVALID)