diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-11-18 16:36:12 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-11-18 15:16:58 +0000 |
| commit | 5da50768716fbcb0ffc093ecd588527723109fed (patch) | |
| tree | b6343cad3ec9ee80c556bf76d5136fd5aa61cae6 /officecfg | |
| parent | 99648095012187ef284d0a9399a8e12878b2a370 (diff) | |
Unify menu-based toolbar controllers
The new GenericPopupToolbarController takes by default
the popup menu controller that registered for the same
.uno:Something command, and sets ToolBoxItemBits to
ToolBoxItemBits::DROPDOWNONLY. If a different command
specified using the "Value" property - takes the popup
menu controller that registered for this command, and
sets bits to ToolBoxItemBits::DROPDOWN.
Change-Id: I75c5300bd27fcc9f618f2ee0df2aa6aefd088239
Reviewed-on: https://gerrit.libreoffice.org/20040
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 53 |
1 files changed, 49 insertions, 4 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 3a28f01e64cf..c603356f24e0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -892,7 +892,7 @@ <value>com.sun.star.report.ReportToolboxController</value> </prop> </node> - <node oor:name="org.apache.openoffice.comp.framework.OpenToolbarController" oor:op="replace"> + <node oor:name="OpenToolbarController" oor:op="replace"> <prop oor:name="Command"> <value>.uno:Open</value> </prop> @@ -900,7 +900,52 @@ <value/> </prop> <prop oor:name="Controller"> - <value>org.apache.openoffice.comp.framework.OpenToolbarController</value> + <value>com.sun.star.comp.framework.GenericPopupToolbarController</value> + </prop> + <prop oor:name="Value"> + <value>.uno:RecentFileList</value> + </prop> + </node> + <node oor:name="WriterOpenToolbarController" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:OpenFromWriter</value> + </prop> + <prop oor:name="Module"> + <value>com.sun.star.text.TextDocument</value> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.framework.GenericPopupToolbarController</value> + </prop> + <prop oor:name="Value"> + <value>.uno:RecentFileList</value> + </prop> + </node> + <node oor:name="CalcOpenToolbarController" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:OpenFromCalc</value> + </prop> + <prop oor:name="Module"> + <value>com.sun.star.sheet.SpreadsheetDocument</value> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.framework.GenericPopupToolbarController</value> + </prop> + <prop oor:name="Value"> + <value>.uno:RecentFileList</value> + </prop> + </node> + <node oor:name="SaveToolbarController" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:Save</value> + </prop> + <prop oor:name="Module"> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.framework.GenericPopupToolbarController</value> + </prop> + <prop oor:name="Value"> + <value>.uno:SaveAsMenu</value> </prop> </node> <node oor:name="org.apache.openoffice.comp.framework.NewToolbarController" oor:op="replace"> @@ -914,7 +959,7 @@ <value>org.apache.openoffice.comp.framework.NewToolbarController</value> </prop> </node> - <node oor:name="org.apache.openoffice.comp.framework.WizardsToolbarController" oor:op="replace"> + <node oor:name="WizardsToolbarController" oor:op="replace"> <prop oor:name="Command"> <value>.uno:AutoPilotMenu</value> </prop> @@ -922,7 +967,7 @@ <value/> </prop> <prop oor:name="Controller"> - <value>org.apache.openoffice.comp.framework.WizardsToolbarController</value> + <value>com.sun.star.comp.framework.GenericPopupToolbarController</value> </prop> </node> </node> |