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 /reportdesign/inc | |
| 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 'reportdesign/inc')
| -rw-r--r-- | reportdesign/inc/RptResId.hrc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index b55a353594a4..9ea0cf255b3b 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -208,9 +208,8 @@ #define RID_STR_PARAADJUST (RID_STRING_START + 161) // menu ----------------------------------------------------------------------- -#define RID_MENU_REPORT ( RID_MENU_START + 0 ) -#define RID_GROUPSROWPOPUPMENU ( RID_MENU_START + 1 ) -#define RID_MENU_NAVIGATOR ( RID_MENU_START + 2 ) +#define RID_GROUPSROWPOPUPMENU ( RID_MENU_START + 0 ) +#define RID_MENU_NAVIGATOR ( RID_MENU_START + 1 ) // bitmaps #define RID_SVXBMP_SELECT_REPORT (RID_BITMAP_START + 0 ) #define RID_SVXBMP_FM_FIXEDTEXT (RID_BITMAP_START + 1 ) |