diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-12-04 12:29:39 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-12-04 14:00:38 +0100 |
| commit | dbcc736e6f7fd540c8edd7f73a2eb80525fcf17a (patch) | |
| tree | e3159fea6ea3ec90630733dba0b14c6b1e67f985 /sc | |
| parent | 13504aab04e01a14580b35c9f1a24db6fa6e720e (diff) | |
Revert "Avoid crash while closing autofilter"
This reverts commit 8e75c42253d92a014baf24dda82d3379bd736978.
Fixed by other patch solving problem in DockingManager
during removing DockingWindows.
see "Avoid crash on closing docking window"
Change-Id: I1a2d0a18705ad497f3aef0edcf01e2b8d57b5cd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107216
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/inc/checklistmenu.hxx | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 6798520f1ffb..deeb987ee806 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -400,8 +400,7 @@ void ScCheckListMenuControl::setSubMenuFocused(const ScCheckListMenuControl* pSu void ScCheckListMenuControl::EndPopupMode() { vcl::Window::GetDockingManager()->EndPopupMode(mxFrame); - if (!mbDisposing) - mxFrame->EnableDocking(false); + mxFrame->EnableDocking(false); } void ScCheckListMenuControl::StartPopupMode(const tools::Rectangle& rRect, FloatWinPopupFlags eFlags) @@ -466,7 +465,6 @@ ScCheckListMenuControl::ScCheckListMenuControl(ScCheckListMenuWindow* pParent, v , mbCanHaveSubMenu(bCanHaveSubMenu) , maOpenTimer(this) , maCloseTimer(this) - , mbDisposing(false) { /* tdf#136559 If we have no dates we don't need a tree @@ -581,7 +579,6 @@ void ScCheckListMenuControl::GrabFocus() ScCheckListMenuControl::~ScCheckListMenuControl() { - mbDisposing = true; EndPopupMode(); for (auto& rMenuItem : maMenuItems) rMenuItem.mxSubMenuWin.disposeAndClear(); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 74014e9ce80d..5d4d6a6abd33 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -293,7 +293,6 @@ private: SubMenuItemData maOpenTimer; SubMenuItemData maCloseTimer; - bool mbDisposing; }; /** |