diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-21 15:43:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-22 17:55:28 +0100 |
| commit | eae55d7397f953ca8a4be1a2665e8ca887adfe81 (patch) | |
| tree | 47d84a1b81c3a4d7b4719b328cb1241ae80f1a2f /svx/util | |
| parent | 2399373778cf0778ad15b1fec9a1bf289b4089de (diff) | |
rework line style to be a wide toolbar button
involves converting SvxLineStyleToolBoxControl to a PopupWindowController
because chart is doing interesting things in its panel there needs to be
a non-standard way to report/detect the selected line style, which is
then reused to disable/enable the arrows when none is selected/deselected
in non-chart sidebars
SvxLineBox becomes a toolbar dropdown instead of a combobox itemwindow
linectrl.cxx split into linewidthctrl.cxx and linewidthctrl because
SvxLineBox is now needed in svxcore
Change-Id: Icf0ef5e612b894a43d389af8a2908138c2e9c580
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87164
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/util')
| -rw-r--r-- | svx/util/svx.component | 4 | ||||
| -rw-r--r-- | svx/util/svxcore.component | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/svx/util/svx.component b/svx/util/svx.component index e54318dea597..81cae7623bd2 100644 --- a/svx/util/svx.component +++ b/svx/util/svx.component @@ -100,10 +100,6 @@ constructor="com_sun_star_comp_svx_SmartTagMenuController_get_implementation"> <service name="com.sun.star.frame.PopupMenuController"/> </implementation> - <implementation name="com.sun.star.comp.svx.LineEndToolBoxControl" - constructor="com_sun_star_comp_svx_LineEndToolBoxControl_get_implementation"> - <service name="com.sun.star.frame.ToolbarController"/> - </implementation> <implementation name="com.sun.star.comp.svx.LineSpacingToolBoxControl" constructor="com_sun_star_comp_svx_LineSpacingToolBoxControl_get_implementation"> <service name="com.sun.star.frame.ToolbarController"/> diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component index 50fedcc67feb..2c5a103857c4 100644 --- a/svx/util/svxcore.component +++ b/svx/util/svxcore.component @@ -62,6 +62,14 @@ constructor="com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> + <implementation name="com.sun.star.comp.svx.LineEndToolBoxControl" + constructor="com_sun_star_comp_svx_LineEndToolBoxControl_get_implementation"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.LineStyleToolBoxControl" + constructor="com_sun_star_comp_svx_LineStyleToolBoxControl_get_implementation"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> <implementation name="com.sun.star.comp.Svx.GraphicExportHelper" constructor="com_sun_star_comp_Svx_GraphicExportHelper_get_implementation"> <service name="com.sun.star.document.BinaryStreamResolver"/> |