summaryrefslogtreecommitdiff
path: root/reportdesign/UIConfig_dbreport.mk
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-02-18 21:18:03 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2017-02-18 20:22:08 +0000
commit5280121732324eff5a30087a36a50c58524b8ef3 (patch)
treeb2e9cb5432eaf528dabc8ae1be14ecb65054511e /reportdesign/UIConfig_dbreport.mk
parent423beaf852aefb6a62882ac0ca55443113fda8b1 (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 'reportdesign/UIConfig_dbreport.mk')
-rw-r--r--reportdesign/UIConfig_dbreport.mk4
1 files changed, 4 insertions, 0 deletions
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 \
))