summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-11-29 16:22:00 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-11-29 21:22:55 +0100
commit0c756e86e3a9b2a249d20e1dc6b96b5bbe39b7ab (patch)
tree19f6fb3683f28a424a409845f97f4c7c5327ac04 /sc/source
parentf08ef920b744b5eb41ac96ab3dc58a23c27e3ab9 (diff)
close menu a followed by open menu b should not cancel open menu b
Change-Id: I9c708811d9eea04a2421c97a97d7dce14fdc8e63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126058 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx4
1 files changed, 0 insertions, 4 deletions
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;
}
}
}