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 /officecfg | |
| 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 'officecfg')
3 files changed, 15 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu index 0a797cdd0e07..0bbaab8d50d5 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu @@ -75,6 +75,11 @@ <value xml:lang="en-US">Media</value> </prop> </node> + <node oor:name="private:resource/popupmenu/notebookbar" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Notebookbar</value> + </prop> + </node> <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace"> <prop oor:name="UIName" oor:type="xs:string"> <value xml:lang="en-US">OLE Object</value> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu index 9669f88a811d..2f81b1143f78 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu @@ -100,6 +100,11 @@ <value xml:lang="en-US">Multiple Selection</value> </prop> </node> + <node oor:name="private:resource/popupmenu/notebookbar" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Notebookbar</value> + </prop> + </node> <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace"> <prop oor:name="UIName" oor:type="xs:string"> <value xml:lang="en-US">OLE Object</value> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index f1eb33d19754..740462ad46c7 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -60,6 +60,11 @@ <value xml:lang="en-US">Media</value> </prop> </node> + <node oor:name="private:resource/popupmenu/notebookbar" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Notebookbar</value> + </prop> + </node> <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace"> <prop oor:name="UIName" oor:type="xs:string"> <value xml:lang="en-US">OLE Object</value> |