From 5280121732324eff5a30087a36a50c58524b8ef3 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Sat, 18 Feb 2017 21:18:03 +0200 Subject: 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 Reviewed-by: Maxim Monastirsky --- reportdesign/UIConfig_dbreport.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'reportdesign/UIConfig_dbreport.mk') diff --git a/reportdesign/UIConfig_dbreport.mk b/reportdesign/UIConfig_dbreport.mk index 5b8b4d48e460..84327116ecb4 100644 --- a/reportdesign/UIConfig_dbreport.mk +++ b/reportdesign/UIConfig_dbreport.mk @@ -13,6 +13,10 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/dbreport,\ reportdesign/uiconfig/dbreport/menubar/menubar \ )) +$(eval $(call gb_UIConfig_add_popupmenufiles,modules/dbreport,\ + reportdesign/uiconfig/dbreport/popupmenu/report \ +)) + $(eval $(call gb_UIConfig_add_statusbarfiles,modules/dbreport,\ reportdesign/uiconfig/dbreport/statusbar/statusbar \ )) -- cgit