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

[Caolán McNamara]

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

New commits:
commit 1cd4913603d112b47106939de350aaca3143d37a
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
    
    Change-Id: Iccc5dad7af41f39ac02d3be93e935f2d926a82a6
    (cherry picked from commit f67dc04cfdd9e63a45ec6c8bc00829bce8f17d4b)
    Reviewed-on: https://gerrit.libreoffice.org/34076
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 934fdb0..e88914c 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2556,7 +2556,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)
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index e7e6683..f31dff2 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -164,7 +164,7 @@ namespace
 
 bool Accelerator::ToggleMnemonicsOnHierarchy(const CommandEvent& rCEvent, vcl::Window *pWindow)
 {
-    if (rCEvent.GetCommand() == CommandEventId::ModKeyChange)
+    if (rCEvent.GetCommand() == CommandEventId::ModKeyChange && ImplGetSVData()->maNWFData.mbAutoAccel)
     {
         const CommandModKeyData *pCData = rCEvent.GetModKeyData();
         const bool bShowAccel = pCData && pCData->IsMod2();