vcl/source/window/menu.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 946049692eff89f0571983df8f0362399d2dd656
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon May 8 14:14:26 2017 +0100
Resolves: tdf#107693 move CreateAutoMnemonics from Execute to Activate
Change-Id: Id65dfcc40dd20c391e12108abc6a6531e4c96523
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 053ea8ca95bd..23700d1b45ad 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -244,6 +244,9 @@ void Menu::Activate()
}
bInCallback = false;
}
+
+ if (!aDelData.isDeleted() && !(nMenuFlags & MenuFlags::NoAutoMnemonics))
+ CreateAutoMnemonics();
}
void Menu::Deactivate()
@@ -2844,10 +2847,6 @@ sal_uInt16 PopupMenu::ImplExecute( const
VclPtr<vcl::Window>& pW, const tools::R
ImplCallEventListeners(VclEventId::MenuSubmenuChanged, nPos);
}
}
- else if (!(nMenuFlags & MenuFlags::NoAutoMnemonics))
- {
- CreateAutoMnemonics();
- }
VclPtrInstance<MenuFloatingWindow> pWin( this, pW, nStyle |
WB_SYSTEMWINDOW );
if( pSVData->maNWFData.mbFlatMenu )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
