5280121732
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>
53 lines
2.1 KiB
Makefile
53 lines
2.1 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_UIConfig_UIConfig,modules/dbreport))
|
|
|
|
$(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 \
|
|
))
|
|
|
|
$(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbreport,\
|
|
reportdesign/uiconfig/dbreport/toolbar/alignmentbar \
|
|
reportdesign/uiconfig/dbreport/toolbar/arrowshapes \
|
|
reportdesign/uiconfig/dbreport/toolbar/basicshapes \
|
|
reportdesign/uiconfig/dbreport/toolbar/calloutshapes \
|
|
reportdesign/uiconfig/dbreport/toolbar/drawbar \
|
|
reportdesign/uiconfig/dbreport/toolbar/flowchartshapes \
|
|
reportdesign/uiconfig/dbreport/toolbar/Formatting \
|
|
reportdesign/uiconfig/dbreport/toolbar/reportcontrols \
|
|
reportdesign/uiconfig/dbreport/toolbar/resizebar \
|
|
reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar \
|
|
reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar \
|
|
reportdesign/uiconfig/dbreport/toolbar/starshapes \
|
|
reportdesign/uiconfig/dbreport/toolbar/symbolshapes \
|
|
reportdesign/uiconfig/dbreport/toolbar/toolbar \
|
|
))
|
|
|
|
$(eval $(call gb_UIConfig_add_uifiles,modules/dbreport,\
|
|
reportdesign/uiconfig/dbreport/ui/backgrounddialog \
|
|
reportdesign/uiconfig/dbreport/ui/chardialog \
|
|
reportdesign/uiconfig/dbreport/ui/condformatdialog \
|
|
reportdesign/uiconfig/dbreport/ui/conditionwin \
|
|
reportdesign/uiconfig/dbreport/ui/datetimedialog \
|
|
reportdesign/uiconfig/dbreport/ui/floatingfield \
|
|
reportdesign/uiconfig/dbreport/ui/floatingnavigator \
|
|
reportdesign/uiconfig/dbreport/ui/floatingsort \
|
|
reportdesign/uiconfig/dbreport/ui/pagedialog \
|
|
reportdesign/uiconfig/dbreport/ui/pagenumberdialog \
|
|
))
|
|
# vim: set noet sw=4 ts=4:
|