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

Return values of sdi "method slots" were unused

Also expand nested methods.

Only diff in workdir/SdiTarget is for SID_STYLE_WATERCAN
from sw/sdi/_basesh.sdi which changed the .uno name from
WatercanStyleModeOnOff to StyleWatercanMode, to match the
name in sfx2/sdi/sfx.sdi (it was forced by svidl to have
the same name).

Change-Id: Iaeac9f4f10a36cb0b3afe3de2b6def8cd90edc6d
üst 9f33b802
......@@ -520,7 +520,7 @@ SfxVoidItem Cancel SID_CANCEL
]
SfxObjectItem Cells SID_SC_CELLS
SfxVoidItem Cells SID_SC_CELLS
(SfxInt16Item Column SID_SC_CELLS,SfxInt32Item Row FN_PARAM_1,SfxInt16Item Table FN_PARAM_2)
[
AutoUpdate = FALSE,
......@@ -538,7 +538,7 @@ SfxObjectItem Cells SID_SC_CELLS
]
SfxStringItem CellText SID_SC_CELLTEXT
SfxVoidItem CellText SID_SC_CELLTEXT
(SfxInt16Item Column SID_SC_CELLTEXT,SfxInt32Item Row FN_PARAM_1,SfxInt16Item Table FN_PARAM_2)
[
AutoUpdate = FALSE,
......@@ -702,7 +702,7 @@ SfxInt16Item Column SID_RANGE_COL
]
SfxUInt16Item ColumnWidth FID_COL_WIDTH
SfxVoidItem ColumnWidth FID_COL_WIDTH
(SfxUInt16Item Column FN_PARAM_1,SfxUInt16Item Width FN_PARAM_2)
[
AutoUpdate = FALSE,
......@@ -1095,7 +1095,7 @@ SfxVoidItem DataFilterStandardFilter SID_FILTER
]
SfxObjectItem DataPilotCreate SID_PIVOT_CREATE
SfxVoidItem DataPilotCreate SID_PIVOT_CREATE
(SfxStringItem Destination FN_PARAM_1,SfxStringItem Name FN_PARAM_2,SfxBoolItem TotalCol FN_PARAM_3,SfxBoolItem TotalRow FN_PARAM_4)
[
AutoUpdate = FALSE,
......@@ -2542,7 +2542,7 @@ SfxVoidItem GoRightToEndOfDataSel SID_CURSORBLKRIGHT_SEL
]
SfxStringItem GoToCell SID_CURRENTCELL
SfxVoidItem GoToCell SID_CURRENTCELL
(SfxStringItem ToPoint SID_CURRENTCELL)
[
AutoUpdate = FALSE,
......@@ -2596,7 +2596,7 @@ SfxVoidItem GotoDocument SID_CURRENTDOC
]
SfxStringItem GoToObject SID_CURRENTOBJECT
SfxVoidItem GoToObject SID_CURRENTOBJECT
(SfxStringItem ToObject SID_CURRENTOBJECT)
[
AutoUpdate = FALSE,
......@@ -3451,7 +3451,7 @@ SfxVoidItem ToggleMergeCells FID_MERGE_TOGGLE
]
SfxBoolItem Mirror SID_OBJECT_MIRROR
SfxVoidItem Mirror SID_OBJECT_MIRROR
()
[
AutoUpdate = FALSE,
......@@ -3487,7 +3487,7 @@ SfxVoidItem Move FID_TAB_MOVE
]
SfxStringItem Name FID_TAB_RENAME
SfxVoidItem Name FID_TAB_RENAME
(SfxStringItem Name FID_TAB_RENAME,SfxUInt16Item Index FN_PARAM_1)
[
AutoUpdate = FALSE,
......@@ -3964,7 +3964,7 @@ SfxInt32Item ObjectWidth SID_OBJECT_WIDTH
]
SfxObjectItem Offset SID_RANGE_OFFSET
SfxVoidItem Offset SID_RANGE_OFFSET
(SfxInt16Item Column FN_PARAM_1,SfxInt32Item Row FN_PARAM_2,SfxInt16Item Table FN_PARAM_3)
[
AutoUpdate = FALSE,
......@@ -4147,7 +4147,7 @@ SfxVoidItem PutCell SID_SC_SETTEXT
]
SfxObjectItem Range SID_SC_RANGE
SfxVoidItem Range SID_SC_RANGE
(SfxStringItem Range SID_SC_RANGE,SfxBoolItem KeepSelect FN_PARAM_1)
[
AutoUpdate = FALSE,
......@@ -4386,7 +4386,7 @@ SfxInt32Item Row SID_RANGE_ROW
]
SfxUInt16Item RowHeight FID_ROW_HEIGHT
SfxVoidItem RowHeight FID_ROW_HEIGHT
(SfxInt32Item Row FN_PARAM_1,SfxUInt16Item Height FN_PARAM_2)
[
AutoUpdate = FALSE,
......@@ -4727,7 +4727,7 @@ SfxVoidItem SelectRow SID_SELECT_ROW
]
SfxStringItem SelectScenario SID_SELECT_SCENARIO
SfxVoidItem SelectScenario SID_SELECT_SCENARIO
(SfxStringItem Name SID_SELECT_SCENARIO)
[
AutoUpdate = FALSE,
......@@ -4745,7 +4745,7 @@ SfxStringItem SelectScenario SID_SELECT_SCENARIO
]
SfxBoolItem SetAnchorToCell SID_ANCHOR_CELL
SfxVoidItem SetAnchorToCell SID_ANCHOR_CELL
()
[
AutoUpdate = FALSE,
......@@ -4763,7 +4763,7 @@ SfxBoolItem SetAnchorToCell SID_ANCHOR_CELL
]
SfxBoolItem SetAnchorToPage SID_ANCHOR_PAGE
SfxVoidItem SetAnchorToPage SID_ANCHOR_PAGE
()
[
AutoUpdate = FALSE,
......
......@@ -1423,7 +1423,7 @@ SfxVoidItem Forward SID_MOREFRONT
GroupId = GID_MODIFY;
]
SfxUInt32Item GetBlue SID_GETBLUE
SfxVoidItem GetBlue SID_GETBLUE
(SfxUInt32Item WhatKind ID_VAL_WHATKIND)
[
AutoUpdate = FALSE,
......@@ -1458,7 +1458,7 @@ SfxUInt32Item GetFillStyle SID_GETFILLSTYLE
GroupId = GID_DRAWING;
]
SfxUInt32Item GetGreen SID_GETGREEN
SfxVoidItem GetGreen SID_GETGREEN
(SfxUInt32Item WhatKind ID_VAL_WHATKIND)
[
AutoUpdate = FALSE,
......@@ -1511,7 +1511,7 @@ SfxUInt32Item GetLineWidth SID_GETLINEWIDTH
GroupId = GID_DRAWING;
]
SfxUInt32Item GetRed SID_GETRED
SfxVoidItem GetRed SID_GETRED
(SfxUInt32Item WhatKind ID_VAL_WHATKIND)
[
AutoUpdate = FALSE,
......@@ -2541,7 +2541,7 @@ SfxVoidItem ModifyPage SID_MODIFYPAGE
GroupId = GID_MODIFY;
]
SfxUInt32Item AssignLayout SID_ASSIGN_LAYOUT
SfxVoidItem AssignLayout SID_ASSIGN_LAYOUT
(SfxUInt32Item WhatPage ID_VAL_WHATPAGE, SfxUInt32Item WhatLayout ID_VAL_WHATLAYOUT)
[
AutoUpdate = FALSE,
......
This diff is collapsed.
......@@ -179,7 +179,7 @@ SfxVoidItem Draw SID_DRAW
]
SfxBoolItem FormelCursor SID_FORMULACURSOR
SfxVoidItem FormelCursor SID_FORMULACURSOR
()
[
AutoUpdate = TRUE,
......@@ -272,7 +272,7 @@ SfxVoidItem InsertConfigName SID_INSERTSYMBOL
]
SfxBoolItem ImportFormula SID_IMPORT_FORMULA
SfxVoidItem ImportFormula SID_IMPORT_FORMULA
(SfxStringItem Name SID_IMPORT_FORMULA,SfxStringItem Filter FN_PARAM_1)
[
AutoUpdate = FALSE,
......@@ -290,7 +290,7 @@ SfxBoolItem ImportFormula SID_IMPORT_FORMULA
GroupId = GID_INSERT;
]
SfxBoolItem ImportMathMLClipboard SID_IMPORT_MATHML_CLIPBOARD
SfxVoidItem ImportMathMLClipboard SID_IMPORT_MATHML_CLIPBOARD
()
[
AutoUpdate = FALSE,
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
SfxBoolItem AbsoluteRecord SID_FM_RECORD_ABSOLUTE
SfxVoidItem AbsoluteRecord SID_FM_RECORD_ABSOLUTE
(SfxInt32Item Position FN_PARAM_1)
[
AutoUpdate = TRUE,
......@@ -353,7 +353,7 @@ SfxVoidItem BackgroundImage SID_GALLERY_BG_BRUSH
SfxStringItem TableStyle SID_TABLE_STYLE
SfxVoidItem TableStyle SID_TABLE_STYLE
()
[
AutoUpdate = FALSE,
......@@ -2114,7 +2114,7 @@ SfxBoolItem ConvertToNavigationBar SID_FM_CONVERTTO_NAVIGATIONBAR
]
SfxBoolItem CreateControl SID_FM_CREATE_CONTROL
SfxVoidItem CreateControl SID_FM_CREATE_CONTROL
()
[
AutoUpdate = TRUE,
......@@ -2248,7 +2248,7 @@ SfxVoidItem DefaultBullet FN_NUM_BULLET_ON
]
SfxBoolItem DeleteRecord SID_FM_RECORD_DELETE
SfxVoidItem DeleteRecord SID_FM_RECORD_DELETE
()
[
AutoUpdate = TRUE,
......@@ -2798,7 +2798,7 @@ SfxVoidItem FilterCrit SID_FM_FILTERCRIT
]
SfxBoolItem FirstRecord SID_FM_RECORD_FIRST
SfxVoidItem FirstRecord SID_FM_RECORD_FIRST
()
[
AutoUpdate = TRUE,
......@@ -3382,7 +3382,7 @@ SfxVoidItem FormFilter SID_FM_FILTER_START
]
SfxBoolItem FormFiltered SID_FM_FORM_FILTERED
SfxVoidItem FormFiltered SID_FM_FORM_FILTERED
()
[
AutoUpdate = TRUE,
......@@ -3438,7 +3438,7 @@ SfxVoidItem FormFilterExit SID_FM_FILTER_EXIT
]
SfxBoolItem FormFilterNavigator SID_FM_FILTER_NAVIGATOR
SfxVoidItem FormFilterNavigator SID_FM_FILTER_NAVIGATOR
()
[
AutoUpdate = TRUE,
......@@ -4487,7 +4487,7 @@ SfxVoidItem EditAnnotation SID_EDIT_POSTIT
GroupId = GID_EDIT;
]
SfxBoolItem ShowAnnotations SID_SHOW_POSTIT
SfxVoidItem ShowAnnotations SID_SHOW_POSTIT
()
[
AutoUpdate = FALSE,
......@@ -4635,7 +4635,7 @@ SfxVoidItem InsertGalleryPic SID_GALLERY_FORMATS
]
SfxBoolItem InsertGraphic SID_INSERT_GRAPHIC
SfxVoidItem InsertGraphic SID_INSERT_GRAPHIC
(SfxStringItem FileName SID_INSERT_GRAPHIC,SfxStringItem FilterName FN_PARAM_FILTER,SfxBoolItem AsLink FN_PARAM_1,SfxStringItem Style FN_PARAM_2)
[
AutoUpdate = FALSE,
......@@ -5082,7 +5082,7 @@ SvxLanguageItem LanguageLatin SID_ATTR_CHAR_LATIN_LANGUAGE
]
SfxBoolItem LastRecord SID_FM_RECORD_LAST
SfxVoidItem LastRecord SID_FM_RECORD_LAST
()
[
AutoUpdate = TRUE,
......@@ -5509,7 +5509,7 @@ XLineDashItem LineDash SID_ATTR_LINE_DASH
]
SfxBoolItem LineEndStyle SID_ATTR_LINEEND_STYLE
SfxVoidItem LineEndStyle SID_ATTR_LINEEND_STYLE
(XLineStartItem LineStart SID_ATTR_LINE_START,XLineEndItem LineEnd SID_ATTR_LINE_END,SfxUInt32Item StartWidth SID_ATTR_LINE_STARTWIDTH,SfxUInt32Item EndWidth SID_ATTR_LINE_ENDWIDTH)
[
AutoUpdate = FALSE,
......@@ -5699,7 +5699,7 @@ SfxVoidItem Merge SID_POLY_MERGE
SfxBoolItem NewRecord SID_FM_RECORD_NEW
SfxVoidItem NewRecord SID_FM_RECORD_NEW
()
[
AutoUpdate = TRUE,
......@@ -5719,7 +5719,7 @@ SfxBoolItem NewRecord SID_FM_RECORD_NEW
]
SfxBoolItem NextRecord SID_FM_RECORD_NEXT
SfxVoidItem NextRecord SID_FM_RECORD_NEXT
()
[
AutoUpdate = TRUE,
......@@ -6464,7 +6464,7 @@ SfxPointItem Position SID_ATTR_POSITION
]
SfxBoolItem PrevRecord SID_FM_RECORD_PREV
SfxVoidItem PrevRecord SID_FM_RECORD_PREV
()
[
AutoUpdate = TRUE,
......@@ -6751,7 +6751,7 @@ SfxBoolItem ReadOnlyMode SID_READONLY_MODE
]
SfxBoolItem RecFromText SID_FM_RECORD_FROM_TEXT
SfxVoidItem RecFromText SID_FM_RECORD_FROM_TEXT
()
[
AutoUpdate = TRUE,
......@@ -6771,7 +6771,7 @@ SfxBoolItem RecFromText SID_FM_RECORD_FROM_TEXT
]
SfxBoolItem RecSave SID_FM_RECORD_SAVE
SfxVoidItem RecSave SID_FM_RECORD_SAVE
()
[
AutoUpdate = TRUE,
......@@ -6888,7 +6888,7 @@ SfxVoidItem Rect_Unfilled SID_DRAW_RECT_NOFILL
]
SfxBoolItem RecText SID_FM_RECORD_TEXT
SfxVoidItem RecText SID_FM_RECORD_TEXT
()
[
AutoUpdate = TRUE,
......@@ -6908,7 +6908,7 @@ SfxBoolItem RecText SID_FM_RECORD_TEXT
]
SfxStringItem RecTotal SID_FM_RECORD_TOTAL
SfxVoidItem RecTotal SID_FM_RECORD_TOTAL
()
[
AutoUpdate = TRUE,
......@@ -6928,7 +6928,7 @@ SfxStringItem RecTotal SID_FM_RECORD_TOTAL
]
SfxBoolItem RecUndo SID_FM_RECORD_UNDO
SfxVoidItem RecUndo SID_FM_RECORD_UNDO
()
[
AutoUpdate = TRUE,
......@@ -7002,7 +7002,7 @@ SfxVoidItem RemoveFilterSort SID_FM_REMOVE_FILTER_SORT
]
SfxSetItem ReplaceSet FID_SEARCH_REPLACESET
SfxVoidItem ReplaceSet FID_SEARCH_REPLACESET
()
[
AutoUpdate = FALSE,
......@@ -7170,7 +7170,7 @@ SfxVoidItem SbaExecuteSql SID_FM_EXECUTE
]
SfxBoolItem SbaNativeSql SID_FM_NATIVESQL
SfxVoidItem SbaNativeSql SID_FM_NATIVESQL
()
[
AutoUpdate = TRUE,
......@@ -7315,7 +7315,7 @@ SfxVoidItem SearchOn FID_SEARCH_ON
]
SfxSetItem SearchSet FID_SEARCH_SEARCHSET
SfxVoidItem SearchSet FID_SEARCH_SEARCHSET
()
[
AutoUpdate = FALSE,
......@@ -7443,7 +7443,7 @@ SvxLongLRSpaceItem SetLongLeftRightMargin SID_ATTR_LONG_LRSPACE
]
SvxLongULSpaceItem SetLongTopBottomMargin SID_ATTR_LONG_ULSPACE
SfxVoidItem SetLongTopBottomMargin SID_ATTR_LONG_ULSPACE
(SvxLongULSpaceItem Space SID_ATTR_LONG_ULSPACE)
[
AutoUpdate = FALSE,
......@@ -7729,7 +7729,7 @@ SfxBoolItem ShowProperties SID_FM_SHOW_PROPERTIES
]
SfxBoolItem ShowPropertyBrowser SID_FM_SHOW_PROPERTY_BROWSER
SfxVoidItem ShowPropertyBrowser SID_FM_SHOW_PROPERTY_BROWSER
()
[
AutoUpdate = TRUE,
......@@ -8234,7 +8234,7 @@ SvxTabStopItem TabstopsVertical SID_ATTR_TABSTOP_VERTICAL
]
SfxBoolItem TestMode SID_DIALOG_TESTMODE
SfxVoidItem TestMode SID_DIALOG_TESTMODE
()
[
AutoUpdate = TRUE,
......@@ -8428,7 +8428,7 @@ SfxBoolItem TimeField SID_FM_TIMEFIELD
]
SfxBoolItem ToggleObjectBezierMode SID_BEZIER_EDIT
SfxVoidItem ToggleObjectBezierMode SID_BEZIER_EDIT
()
[
AutoUpdate = TRUE,
......@@ -8447,7 +8447,7 @@ SfxBoolItem ToggleObjectBezierMode SID_BEZIER_EDIT
]
SfxBoolItem ToggleObjectRotateMode SID_OBJECT_ROTATE
SfxVoidItem ToggleObjectRotateMode SID_OBJECT_ROTATE
()
[
AutoUpdate = TRUE,
......@@ -8540,7 +8540,7 @@ SfxVoidItem TransformDialog SID_ATTR_TRANSFORM
]
SfxBoolItem TwainSelect SID_TWAIN_SELECT
SfxVoidItem TwainSelect SID_TWAIN_SELECT
()
[
AutoUpdate = FALSE,
......@@ -9474,7 +9474,7 @@ SvxColumnItem RulerRowsVertical SID_RULER_ROWS_VERTICAL
SvxFontListItem FontNameList SID_ATTR_CHAR_FONTLIST
SfxVoidItem FontNameList SID_ATTR_CHAR_FONTLIST
()
[
// flags:
......@@ -9809,7 +9809,7 @@ SfxVoidItem FontworkGalleryFloater SID_FONTWORK_GALLERY_FLOATER
]
SfxBoolItem FontworkShapeType SID_FONTWORK_SHAPE_TYPE
SfxVoidItem FontworkShapeType SID_FONTWORK_SHAPE_TYPE
(SfxStringItem FontworkShapeType SID_FONTWORK_SHAPE_TYPE)
[
AutoUpdate = TRUE,
......@@ -9966,7 +9966,7 @@ SfxBoolItem FontworkKernCharacterPairs SID_FONTWORK_KERN_CHARACTER_PAIRS
]
OfaRefItem GetColorTable SID_GET_COLORLIST
SfxVoidItem GetColorTable SID_GET_COLORLIST
()
[
AutoUpdate = FALSE,
......@@ -10002,7 +10002,7 @@ SfxVoidItem SpellCheckerChanged SID_SPELLCHECKER_CHANGED
]
SfxUInt16Item Year2000 SID_ATTR_YEAR2000
SfxVoidItem Year2000 SID_ATTR_YEAR2000
()
[
AutoUpdate = FALSE,
......@@ -10206,7 +10206,7 @@ SfxVoidItem SbaBrwInsert SID_SBA_BRW_INSERT
]
SfxBoolItem BasicShapes SID_DRAWTBX_CS_BASIC
SfxVoidItem BasicShapes SID_DRAWTBX_CS_BASIC
(SfxStringItem BasicShapes SID_DRAWTBX_CS_BASIC)
[
AutoUpdate = TRUE,
......@@ -10226,7 +10226,7 @@ SfxBoolItem BasicShapes SID_DRAWTBX_CS_BASIC
]
SfxBoolItem SymbolShapes SID_DRAWTBX_CS_SYMBOL
SfxVoidItem SymbolShapes SID_DRAWTBX_CS_SYMBOL
(SfxStringItem SymbolShapes SID_DRAWTBX_CS_SYMBOL)
[
AutoUpdate = TRUE,
......@@ -10246,7 +10246,7 @@ SfxBoolItem SymbolShapes SID_DRAWTBX_CS_SYMBOL
]
SfxBoolItem ArrowShapes SID_DRAWTBX_CS_ARROW
SfxVoidItem ArrowShapes SID_DRAWTBX_CS_ARROW
(SfxStringItem ArrowShapes SID_DRAWTBX_CS_ARROW)
[
AutoUpdate = TRUE,
......@@ -10266,7 +10266,7 @@ SfxBoolItem ArrowShapes SID_DRAWTBX_CS_ARROW
]
SfxBoolItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART
SfxVoidItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART
(SfxStringItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART)
[
AutoUpdate = TRUE,
......@@ -10286,7 +10286,7 @@ SfxBoolItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART
]
SfxBoolItem CalloutShapes SID_DRAWTBX_CS_CALLOUT
SfxVoidItem CalloutShapes SID_DRAWTBX_CS_CALLOUT
(SfxStringItem CalloutShapes SID_DRAWTBX_CS_CALLOUT)
[
AutoUpdate = TRUE,
......@@ -10306,7 +10306,7 @@ SfxBoolItem CalloutShapes SID_DRAWTBX_CS_CALLOUT
]
SfxBoolItem StarShapes SID_DRAWTBX_CS_STAR
SfxVoidItem StarShapes SID_DRAWTBX_CS_STAR
(SfxStringItem StarShapes SID_DRAWTBX_CS_STAR)
[
AutoUpdate = TRUE,
......@@ -10473,7 +10473,7 @@ SvxEmphasisMarkItem EmphasisMark SID_ATTR_CHAR_EMPHASISMARK
]
SfxBoolItem ShowDataNavigator SID_FM_SHOW_DATANAVIGATOR
SfxVoidItem ShowDataNavigator SID_FM_SHOW_DATANAVIGATOR
()
[
AutoUpdate = TRUE,
......@@ -11972,4 +11972,4 @@ SfxVoidItem HangingIndent SID_HANGING_INDENT
MenuConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
\ No newline at end of file
]
......@@ -308,16 +308,16 @@ interface BaseTextSelection
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
SfxBoolItem StyleWatercanMode SID_STYLE_WATERCAN // status()
SfxVoidItem StyleWatercanMode SID_STYLE_WATERCAN // status()
(
SfxStringItem Param SID_STYLE_WATERCAN ,
SfxUInt16Item Family SID_STYLE_FAMILY
)
[
SfxUInt16Item WatercanStyleModeOnOff
(
SfxStringItem Param SID_STYLE_WATERCAN ,
SfxUInt16Item Family SID_STYLE_FAMILY
) ;
ExecMethod = Execute ;
StateMethod = StateStyle ;
NoRecord;
NoRecord;
SlotType = SfxBoolItem ;
GroupId = GID_TEMPLATE ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
......
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