From 0c756e86e3a9b2a249d20e1dc6b96b5bbe39b7ab Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 29 Nov 2021 16:22:00 +0000 Subject: close menu a followed by open menu b should not cancel open menu b MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9c708811d9eea04a2421c97a97d7dce14fdc8e63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126058 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- sc/source/ui/cctrl/checklistmenu.cxx | 4 ---- 1 file changed, 4 deletions(-) (limited to 'sc/source') diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 8a4add14b4fd..e7cdd6c19fe8 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -218,16 +218,12 @@ void ScCheckListMenuControl::handleMenuTimeout(const SubMenuItemData* pTimer) // end submenu. if (maCloseTimer.mpSubMenu) { - maOpenTimer.mpSubMenu = nullptr; - maCloseTimer.mpSubMenu->EndPopupMode(); maCloseTimer.mpSubMenu = nullptr; // EndPopup sends a user event, and we want this focus to be set after that has done its conflicting focus-setting work if (!mnAsyncPostPopdownId) mnAsyncPostPopdownId = Application::PostUserEvent(LINK(this, ScCheckListMenuControl, PostPopdownHdl)); - - maOpenTimer.mnMenuPos = MENU_NOT_SELECTED; } } } -- cgit