diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-15 21:02:49 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-16 13:07:58 +0000 |
| commit | 535f2b2b0a21407c4412d14149d271a199c3e6b8 (patch) | |
| tree | 934fbcebf62de9ace52d160f34ae018c99304058 /sc | |
| parent | c5555c1698665011457147b1f15ea00f04665a05 (diff) | |
Convert RID_MENU_NOTEBOOKBAR to xml
Brings a lot of features (icons, keyboard shortcuts,
customization, context menu interception etc.)
Other changes:
- Make SfxDispatcher::ExecutePopup take PopupMenuFlags
arg, to be able to pass NoMouseUpClose, so that the
menu won't close on mouse-up under anything != gtk3.
- Make .uno:OpenFromWriter and .uno:OpenFromCalc async
slots, to avoid crash under gtk3 when recycling the
current frame.
- Don't show the menu in customization dialog, if
experimental mode disabled.
Change-Id: Ieea2f73f6b48fbaf4bdfc4acf1a33d25422357cb
Reviewed-on: https://gerrit.libreoffice.org/33101
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/UIConfig_scalc.mk | 1 | ||||
| -rw-r--r-- | sc/sdi/scalc.sdi | 1 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/popupmenu/notebookbar.xml | 19 |
3 files changed, 21 insertions, 0 deletions
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 056dbdace4cb..89527f367a4f 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -35,6 +35,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\ sc/uiconfig/scalc/popupmenu/freezepanes \ sc/uiconfig/scalc/popupmenu/graphic \ sc/uiconfig/scalc/popupmenu/media \ + sc/uiconfig/scalc/popupmenu/notebookbar \ sc/uiconfig/scalc/popupmenu/oleobject \ sc/uiconfig/scalc/popupmenu/pagebreak \ sc/uiconfig/scalc/popupmenu/pivot \ diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index aff80507a625..2ca2a7b2b74d 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -6468,6 +6468,7 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC Container = FALSE, RecordAbsolute = FALSE, RecordPerSet; + Asynchron; SlotType = SfxStringItem diff --git a/sc/uiconfig/scalc/popupmenu/notebookbar.xml b/sc/uiconfig/scalc/popupmenu/notebookbar.xml new file mode 100644 index 000000000000..29356d5c8281 --- /dev/null +++ b/sc/uiconfig/scalc/popupmenu/notebookbar.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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/. + * +--> +<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu"> + <menu:menuitem menu:id=".uno:OpenFromCalc"/> + <menu:menuitem menu:id=".uno:Save"/> + <menu:menuitem menu:id=".uno:Undo"/> + <menu:menuitem menu:id=".uno:Redo"/> + <menu:menuitem menu:id=".uno:Print"/> + <menu:menuitem menu:id=".uno:Menubar"/> + <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> + <menu:menuitem menu:id=".uno:CloseDoc"/> +</menu:menupopup> |