diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-12 15:42:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-16 09:54:13 +0200 |
| commit | 8a2f7704cd0e43304e54bf2281232335cc0979a3 (patch) | |
| tree | a8357d52e613dbff7bd4b6097f75be6871863ce6 /vcl/source/window/menu.cxx | |
| parent | 7dc9fb33db45c269fece6cfec993b124491c68f6 (diff) | |
drop LazyDeletor
Change-Id: I7d2e00466f321994a46b0529d645e342f229c929
Reviewed-on: https://gerrit.libreoffice.org/61718
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/window/menu.cxx')
| -rw-r--r-- | vcl/source/window/menu.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 686694e8e0c0..699ba937ee95 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2952,8 +2952,8 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const tools::R { pWin->StopExecute(); pWin->doShutdown(); - pWindow->doLazyDelete(); - pWindow = nullptr; + pWindow->SetParentToDefaultWindow(); + pWindow.disposeAndClear(); ImplClosePopupToolBox(pW); ImplFlushPendingSelect(); return nSelectedId; @@ -3013,8 +3013,8 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const tools::R } } pWin->doShutdown(); - pWindow->doLazyDelete(); - pWindow = nullptr; + pWindow->SetParentToDefaultWindow(); + pWindow.disposeAndClear(); ImplClosePopupToolBox(pW); ImplFlushPendingSelect(); } |