summaryrefslogtreecommitdiff
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-30 09:55:09 +0100
commit843a82a1f5b3c6a220c4fdb70ae03b6ccaf592ac (patch)
tree33308a7fe13e04306414f517ccd252804f013d8d
parented5b0540613117cac0f85da9b270e734a763132d (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/+/126088 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-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 e140cee466d0..80a312b75194 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -226,16 +226,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;
}
}
}