diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-21 10:58:39 +0300 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-21 17:36:09 +0300 |
commit | 74cc3fbc17235f5c0010c363342a9a9adaf85c4e (patch) | |
tree | 102212f766aa8a0abd5691b15e37e48462360ae7 /sd/sdi | |
parent | 3c7a7b538e8ca8b310ae9778ae9ace5ae937a4f1 (diff) |
tdf#36796 Status updates for custom shapes buttons
We're dealing here with 2 bugs:
1. Single shape buttons (like rectangle, ellipse etc.) don't get
the pressed state when active. The cause is that all commands of
the same kind (Basic Shapes, Symbol Shapes etc.) are handled as
one internally, allowing only one type of status updates. It used
to transport the current active shape, but it was changed to a
boolean value in the fix for i#41753, and since then used for
the pressed state of the group buttons.
2. The pressed state of a group button shows always, even when a
user activates a shape from a place other than the drop-down
of that button. But in this case the image of the group button
doesn't update with the current shape, thus confusing the user on
what is currently active. The cause here is that we use (since
i#41753) the XSubToolbarController interface to update the last
selected function (instead of the old-style status based update),
and ToolBarManager notifies a controller about a new selection
only if it was made from a particular toolbar that the controller
claimed to use in the getSubToolbarName method.
Since 7352a7c17875e5adcc4226c45f4a03e11c44ff49 there is a similar
regression for other group buttons in sd (like lines, 3D Objects
and other), with the same cause. This is also fixed now.
Change-Id: Ida074a001ff78bf5bd5bcb8151516daa6e27cbce
Diffstat (limited to 'sd/sdi')
-rw-r--r-- | sd/sdi/sdraw.sdi | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 4a024352d829..d91e21bec36f 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -SfxBoolItem AdvancedMode SID_OBJECT_CHOOSE_MODE +SfxVoidItem AdvancedMode SID_OBJECT_CHOOSE_MODE [ /* flags: */ @@ -196,7 +196,7 @@ SfxUInt16Item AnimatorState SID_ANIMATOR_STATE GroupId = GID_OPTIONS; ] -SfxBoolItem ArrowsToolbox SID_DRAWTBX_ARROWS +SfxVoidItem ArrowsToolbox SID_DRAWTBX_ARROWS [ /* flags: */ @@ -250,7 +250,7 @@ SfxVoidItem BeforeObject SID_BEFORE_OBJ () [ /* flags: */ - AutoUpdate = FALSE, + AutoUpdate = TRUE, Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, @@ -274,7 +274,7 @@ SfxVoidItem BehindObject SID_BEHIND_OBJ () [ /* flags: */ - AutoUpdate = FALSE, + AutoUpdate = TRUE, Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, @@ -1292,7 +1292,7 @@ SfxBoolItem ConnectorLinesCircleStart SID_CONNECTOR_LINES_CIRCLE_START GroupId = GID_CONNECTOR; ] -SfxBoolItem ConnectorToolbox SID_DRAWTBX_CONNECTORS +SfxVoidItem ConnectorToolbox SID_DRAWTBX_CONNECTORS [ /* flags: */ @@ -2157,7 +2157,7 @@ SfxBoolItem CustomAnimationSchemes SID_CUSTOM_ANIMATION_SCHEMES_PANEL GroupId = GID_OPTIONS; ] -SfxBoolItem EllipseToolbox SID_DRAWTBX_ELLIPSES +SfxVoidItem EllipseToolbox SID_DRAWTBX_ELLIPSES [ /* flags: */ @@ -3889,7 +3889,7 @@ SfxVoidItem LineTo SID_LINETO GroupId = GID_DRAWING; ] -SfxBoolItem LineToolbox SID_DRAWTBX_LINES +SfxVoidItem LineToolbox SID_DRAWTBX_LINES [ /* flags: */ @@ -4516,7 +4516,7 @@ SfxBoolItem NotesMode SID_NOTESMODE GroupId = GID_VIEW; ] -SfxBoolItem ObjectPosition SID_POSITION +SfxVoidItem ObjectPosition SID_POSITION [ /* flags: */ @@ -4542,7 +4542,7 @@ SfxBoolItem ObjectPosition SID_POSITION GroupId = GID_MODIFY; ] -SfxBoolItem Objects3DToolbox SID_DRAWTBX_3D_OBJECTS +SfxVoidItem Objects3DToolbox SID_DRAWTBX_3D_OBJECTS [ /* flags: */ @@ -5195,7 +5195,7 @@ SfxBoolItem QuickEdit SID_QUICKEDIT GroupId = GID_OPTIONS; ] -SfxBoolItem RectangleToolbox SID_DRAWTBX_RECTANGLES +SfxVoidItem RectangleToolbox SID_DRAWTBX_RECTANGLES [ /* flags: */ @@ -5994,7 +5994,7 @@ SfxBoolItem TextAutoFitToSize SID_OUTLINE_TEXT_AUTOFIT GroupId = GID_FORMAT; ] -SfxBoolItem TextToolbox SID_DRAWTBX_TEXT +SfxVoidItem TextToolbox SID_DRAWTBX_TEXT [ /* flags: */ |