diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-02-01 18:39:51 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-02-02 09:32:36 +0000 |
| commit | 11d605cc5a0c221d2423b6e63f502db660d085d2 (patch) | |
| tree | 018a88d0fe4e56ec0c69a40596227cb70dfdf847 /svx/sdi | |
| parent | 8b65dec8e0fdfc8564597e90aff91b971e23f7ce (diff) | |
tdf#84843 Stop using PseudoSlots for drawing slots
Instead of fighting with this obsolete thing, let's
just kill it. This fixes disabling in read-only doc,
as well as pressed/unpressed states.
Change-Id: I4d06ba3395024ffd09d77c6d22653a2c5e227115
Reviewed-on: https://gerrit.libreoffice.org/22010
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'svx/sdi')
| -rw-r--r-- | svx/sdi/svx.sdi | 4 | ||||
| -rw-r--r-- | svx/sdi/svxitems.sdi | 22 |
2 files changed, 1 insertions, 25 deletions
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 2c7fae317474..6856a07d9cfb 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -3333,7 +3333,7 @@ SfxBoolItem DrawSelect SID_DRAW_SELECT ] -SvxDrawToolItem InsertDraw SID_INSERT_DRAW +SfxBoolItem InsertDraw SID_INSERT_DRAW [ /* flags: */ @@ -3357,8 +3357,6 @@ SvxDrawToolItem InsertDraw SID_INSERT_DRAW StatusBarConfig = FALSE, ToolBoxConfig = TRUE, GroupId = GID_DRAWING; - PseudoSlots = TRUE; - PseudoPrefix = SID_DRAW; ] diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi index 5664a2b77173..4fa991c5bb58 100644 --- a/svx/sdi/svxitems.sdi +++ b/svx/sdi/svxitems.sdi @@ -76,27 +76,6 @@ enum SvxChooseControlEnum }; item SvxChooseControlEnum SvxChooseControlItem; -enum SvxDrawToolEnum -{ - SVX_SNAP_DRAW_SELECT, - - SVX_SNAP_DRAW_LINE, - SVX_SNAP_DRAW_RECT, - SVX_SNAP_DRAW_ELLIPSE, - SVX_SNAP_DRAW_POLYGON_NOFILL, - SVX_SNAP_DRAW_BEZIER_NOFILL, - SVX_SNAP_DRAW_FREELINE_NOFILL, - SVX_SNAP_DRAW_ARC, - SVX_SNAP_DRAW_PIE, - SVX_SNAP_DRAW_CIRCLECUT, - SVX_SNAP_DRAW_TEXT, - SVX_SNAP_DRAW_TEXT_VERTICAL, - SVX_SNAP_DRAW_TEXT_MARQUEE, - SVX_SNAP_DRAW_CAPTION, - SVX_SNAP_DRAW_CAPTION_VERTICAL -}; -item SvxDrawToolEnum SvxDrawToolEnumItem; - enum SvxDrawAlignEnum { SVX_OBJECT_ALIGN_LEFT, @@ -341,7 +320,6 @@ item UINT16 SvxPropSizeItem; // derived from UInt16Item item BOOL SvxShadowedItem; item SvxDrawBezierEnum SvxDrawBezierItem; item SvxDrawAlignEnum SvxDrawAlignItem; -item SvxDrawToolEnum SvxDrawToolItem; item BYTE SvxWidowsItem; item BOOL SvxWordLineModeItem; item SvxCellHorJustifyEnum SvxHorJustifyItem; |