diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-18 21:18:03 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-18 20:22:08 +0000 |
| commit | 5280121732324eff5a30087a36a50c58524b8ef3 (patch) | |
| tree | b2e9cb5432eaf528dabc8ae1be14ecb65054511e /vcl/source/window | |
| parent | 423beaf852aefb6a62882ac0ca55443113fda8b1 (diff) | |
Convert RID_MENU_REPORT to xml
The change in PopupMenu::ImplExecute is needed because
MenuBarManager dispatches commands synchronously, and a
command can try to dispose the parent window of the
MenuFloatingWindow (e.g. right clicking inside the report
header, and choosing "Delete Header"), which will lead to
Application::Abort in a debug build. So we must get rid of
the MenuFloatingWindow before handling menu selection.
Change-Id: I1657cd16a005207abc31f4b65595ab78ed235e37
Reviewed-on: https://gerrit.libreoffice.org/34407
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/menu.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 5a1a2f74efa3..52b868886ef2 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -3017,11 +3017,11 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const Rectangl SalMenu* pMenu = ImplGetSalMenu(); if( pMenu && bRealExecute && pMenu->ShowNativePopupMenu( pWin, aRect, nPopupModeFlags | FloatWinPopupFlags::GrabFocus ) ) { - ImplFlushPendingSelect(); pWin->StopExecute(); pWin->doShutdown(); pWindow->doLazyDelete(); pWindow = nullptr; + ImplFlushPendingSelect(); return nSelectedId; } else |