From 0d8746c091ce3e70340c431da8d35d453d2b3b2c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 9 Feb 2017 10:26:05 +0000 Subject: 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 Reviewed-by: Miklos Vajna --- vcl/source/window/dialog.cxx | 2 +- vcl/source/window/menu.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl') diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index e1603221ad4f..2cebcb16fe0e 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 a647e88c81df..d7f6b0875fff 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(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) -- cgit tion value='distro/collabora/cd-5.3-3.2'>distro/collabora/cd-5.3-3.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
8bcef55c4d9a96cf4c4f47e7edb59a8'>implbase9.hxx
AgeCommit message (Expand)Author
2015-11-10Add a check for non-LIBO_INTERNAL_ONLY, C++03-compatible LibreOfficeKit.hxxStephan Bergmann
AgeCommit message (Expand)Author
2015-10-21com::sun::star->css in include/cppuhelperNoel Grandin