diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-04-30 12:40:20 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-05-01 01:29:32 +0300 |
| commit | 1c6cb1e8386eb627adb0c70169582cc58fd76ec7 (patch) | |
| tree | 20b273bf28da5ccf1f349a12fc3f396dcf10f97d /sd/sdi | |
| parent | 20f33eb7c5ebf2611008f6173da870bd0d1693fc (diff) | |
Remove SlotType sdi property
sdi files have two ways to specify the type of a slot:
(a) Put it at the beginning of the first line
(b) Using the SlotType property
Where (b) have higher priority, and (a) is actually
ignored for "method slots" (i.e. the ones that have
parameter parentheses, even empty, and therefore get
the SfxSlotMode::METHOD flag), which is very
confusing.
The goal here is to make exclusive use of (a) for all
kinds of slots, and eventually remove the SlotType
support code from svidl (in a follow-up commit).
Change-Id: Ib6654d34e2f8aa8ebd0bd3c41aa2a86e30e9a634
Diffstat (limited to 'sd/sdi')
| -rw-r--r-- | sd/sdi/_drvwsh.sdi | 4 | ||||
| -rw-r--r-- | sd/sdi/sdraw.sdi | 16 |
2 files changed, 6 insertions, 14 deletions
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 980e5b744bc7..a83b0149db19 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -1292,9 +1292,9 @@ interface DrawView [ ExecMethod = FuPermanent ; ] - SID_FM_CREATE_FIELDCONTROL + SfxBoolItem CreateFieldControl SID_FM_CREATE_FIELDCONTROL + () [ - SlotType = SfxBoolItem ; ExecMethod = FuPermanent ; ] SID_ATTR_YEAR2000 diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 9f134a2c887a..501de6597102 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -2297,7 +2297,7 @@ SfxVoidItem InteractiveTransparence SID_OBJECT_TRANSPARENCE GroupId = GID_MODIFY; ] -SfxVoidItem LayerMode SID_LAYERMODE +SfxBoolItem LayerMode SID_LAYERMODE (SfxBoolItem IsActive ID_VAL_ISACTIVE,SfxUInt32Item WhatLayer ID_VAL_WHATLAYER) [ AutoUpdate = FALSE, @@ -2308,8 +2308,6 @@ SfxVoidItem LayerMode SID_LAYERMODE RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxBoolItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -2420,7 +2418,7 @@ SfxVoidItem ManageLinks SID_MANAGE_LINKS GroupId = GID_EDIT; ] -SfxVoidItem MasterPage SID_MASTERPAGE +SfxBoolItem MasterPage SID_MASTERPAGE (SfxBoolItem Isactive ID_VAL_ISACTIVE) [ AutoUpdate = FALSE, @@ -2431,8 +2429,6 @@ SfxVoidItem MasterPage SID_MASTERPAGE RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxBoolItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -2987,7 +2983,7 @@ SfxVoidItem PageMargin SID_PAGEMARGIN GroupId = GID_MODIFY; ] -SfxVoidItem PageMode SID_PAGEMODE +SfxBoolItem PageMode SID_PAGEMODE (SfxBoolItem IsActive ID_VAL_ISACTIVE,SfxUInt32Item WhatKind ID_VAL_WHATKIND) [ AutoUpdate = FALSE, @@ -2998,8 +2994,6 @@ SfxVoidItem PageMode SID_PAGEMODE RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxBoolItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -3843,7 +3837,7 @@ SfxVoidItem ZoomMode SID_ZOOM_MODE GroupId = GID_VIEW; ] -SfxVoidItem Mirror SID_OBJECT_MIRROR +SfxBoolItem Mirror SID_OBJECT_MIRROR ( SfxBoolItem MirrorVert ID_VAL_MIRRORVERT ) [ AutoUpdate = TRUE, @@ -3854,8 +3848,6 @@ SfxVoidItem Mirror SID_OBJECT_MIRROR RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxBoolItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, |