Kaydet (Commit) 1c6cb1e8 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky

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
üst 20f33eb7
......@@ -226,7 +226,7 @@ SfxVoidItem AlignBottom SID_ALIGNBOTTOM
]
SfxVoidItem AlignHorizontalCenter SID_ALIGNCENTERHOR
SfxStringItem AlignHorizontalCenter SID_ALIGNCENTERHOR
()
[
AutoUpdate = FALSE,
......@@ -237,8 +237,6 @@ SfxVoidItem AlignHorizontalCenter SID_ALIGNCENTERHOR
RecordAbsolute = FALSE,
RecordPerSet;
SlotType = SfxStringItem
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
......@@ -3689,7 +3687,7 @@ SfxStringItem NumberFormat SID_NUMBER_FORMAT
]
SfxVoidItem NumberFormatCurrency SID_NUMBER_CURRENCY
SfxBoolItem NumberFormatCurrency SID_NUMBER_CURRENCY
(SfxUInt32Item NumberFormatCurrency SID_NUMBER_CURRENCY)
[
AutoUpdate = FALSE,
......@@ -3699,7 +3697,6 @@ SfxVoidItem NumberFormatCurrency SID_NUMBER_CURRENCY
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
SlotType = SfxBoolItem
AccelConfig = TRUE,
MenuConfig = TRUE,
......@@ -6348,7 +6345,7 @@ SfxVoidItem InsertFieldDateVariable SID_INSERT_FIELD_DATE_VAR
]
SfxVoidItem OpenFromCalc SID_OPEN_CALC
SfxStringItem OpenFromCalc SID_OPEN_CALC
()
[
AutoUpdate = FALSE,
......@@ -6360,15 +6357,13 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC
RecordPerSet;
Asynchron;
SlotType = SfxStringItem
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = FALSE,
GroupId = GID_OPTIONS;
]
SfxVoidItem ConvertFormulaToValue SID_CONVERT_FORMULA_TO_VALUE
SfxStringItem ConvertFormulaToValue SID_CONVERT_FORMULA_TO_VALUE
()
[
AutoUpdate = FALSE,
......@@ -6379,8 +6374,6 @@ SfxVoidItem ConvertFormulaToValue SID_CONVERT_FORMULA_TO_VALUE
RecordAbsolute = FALSE,
RecordPerSet;
SlotType = SfxStringItem
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = FALSE,
......
......@@ -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
......
......@@ -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,
......
This diff is collapsed.
This diff is collapsed.
......@@ -308,7 +308,7 @@ interface BaseTextSelection
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
SfxVoidItem StyleWatercanMode SID_STYLE_WATERCAN // status()
SfxBoolItem StyleWatercanMode SID_STYLE_WATERCAN // status()
(
SfxStringItem Param SID_STYLE_WATERCAN ,
SfxUInt16Item Family SID_STYLE_FAMILY
......@@ -317,7 +317,6 @@ interface BaseTextSelection
ExecMethod = Execute ;
StateMethod = StateStyle ;
NoRecord;
SlotType = SfxBoolItem ;
GroupId = GID_TEMPLATE ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
......
......@@ -19,7 +19,6 @@ interface TextDraw : TextDrawBase
{
SID_ATTR_LINEEND_STYLE
[
SlotType = SfxBoolItem ;
ExecMethod = ExecDrawAttrArgs ;
StateMethod = DisableState ;
Export = FALSE;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment