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 /framework/util | |
| 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 'framework/util')
| -rw-r--r-- | framework/util/fwk.component | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/framework/util/fwk.component b/framework/util/fwk.component index e1744fc808a6..4f5edfdf2318 100644 --- a/framework/util/fwk.component +++ b/framework/util/fwk.component @@ -188,18 +188,14 @@ constructor="com_sun_star_comp_framework_TabWindowService_get_implementation"> <service name="com.sun.star.ui.dialogs.TabContainerWindow"/> </implementation> - <implementation name="org.apache.openoffice.comp.framework.OpenToolbarController" - constructor="org_apache_openoffice_comp_framework_OpenToolbarController_get_implementation"> + <implementation name="com.sun.star.comp.framework.GenericPopupToolbarController" + constructor="com_sun_star_comp_framework_GenericPopupToolbarController_get_implementation"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> <implementation name="org.apache.openoffice.comp.framework.NewToolbarController" constructor="org_apache_openoffice_comp_framework_NewToolbarController_get_implementation"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> - <implementation name="org.apache.openoffice.comp.framework.WizardsToolbarController" - constructor="org_apache_openoffice_comp_framework_WizardsToolbarController_get_implementation"> - <service name="com.sun.star.frame.ToolbarController"/> - </implementation> <implementation name="com.sun.star.comp.framework.SubToolBarController" constructor="com_sun_star_comp_framework_SubToolBarController_get_implementation"> <service name="com.sun.star.frame.ToolbarController"/> |