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

7 files changed, 195 insertions, 195 deletions

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index f2737bffb9a2..ccf5b74e152b 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -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,
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 217f8562b3a0..9f134a2c887a 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -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,
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index dfedb685113c..1c4002c3ff9c 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -135,7 +135,7 @@ SfxVoidItem About SID_ABOUT
 ]
 
 
-SfxObjectItem Activate SID_ACTIVATE
+SfxVoidItem Activate SID_ACTIVATE
 ()
 [
     AutoUpdate = FALSE,
@@ -191,7 +191,7 @@ SfxUInt16Item ActualStyleFamily SID_STYLE_FAMILY
 ]
 
 
-SfxObjectItem NewDoc SID_NEWDOC
+SfxVoidItem NewDoc SID_NEWDOC
 (SfxStringItem Region SID_TEMPLATE_REGIONNAME,SfxStringItem Name SID_TEMPLATE_NAME)
 [
     AutoUpdate = FALSE,
@@ -230,7 +230,7 @@ SfxVoidItem AddBookmark SID_CREATELINK
 ]
 
 
-SfxObjectItem AddDirect SID_NEWDOCDIRECT
+SfxVoidItem AddDirect SID_NEWDOCDIRECT
 ()
 [
     AutoUpdate = FALSE,
@@ -576,7 +576,7 @@ SfxTemplateItem CharStyle SID_STYLE_FAMILY1
 ]
 
 
-SfxStringItem ChooseMacro SID_BASICIDE_CHOOSEMACRO
+SfxVoidItem ChooseMacro SID_BASICIDE_CHOOSEMACRO
 ()
 [
     AutoUpdate = FALSE,
@@ -631,7 +631,7 @@ SfxVoidItem CloseDocs SID_CLOSEDOCS
 ]
 
 
-SfxBoolItem CloseDoc SID_CLOSEDOC
+SfxVoidItem CloseDoc SID_CLOSEDOC
 (SfxBoolItem saveChanges SID_CLOSEDOC_SAVE,SfxStringItem fileName SID_CLOSEDOC_FILENAME)
 [
     AutoUpdate = FALSE,
@@ -709,7 +709,7 @@ SfxStringItem Comments SID_DOCINFO_COMMENTS
 ]
 
 
-SfxInt32Item CompareDocuments SID_DOCUMENT_COMPARE
+SfxVoidItem CompareDocuments SID_DOCUMENT_COMPARE
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION, SfxBoolItem NoAcceptDialog SID_NO_ACCEPT_DIALOG)
 [
     AutoUpdate = FALSE,
@@ -969,7 +969,7 @@ SfxVoidItem DeleteCurrent SID_BASICIDE_DELETECURRENT
 ]
 
 
-SfxUInt16Item DeleteStyle SID_STYLE_DELETE
+SfxVoidItem DeleteStyle SID_STYLE_DELETE
 (SfxStringItem Param SID_STYLE_DELETE,SfxUInt16Item Family SID_STYLE_FAMILY)
 [
     AutoUpdate = FALSE,
@@ -1025,7 +1025,7 @@ SfxVoidItem DragHierarchy SID_STYLE_DRAGHIERARCHIE
 ]
 
 
-SfxBoolItem EditDoc SID_EDITDOC
+SfxVoidItem EditDoc SID_EDITDOC
 (SfxBoolItem Editable SID_EDITDOC)
 [
     AutoUpdate = TRUE,
@@ -1063,7 +1063,7 @@ SfxVoidItem EditMacro SID_BASICIDE_EDITMACRO
 ]
 
 
-SfxUInt16Item EditStyle SID_STYLE_EDIT
+SfxVoidItem EditStyle SID_STYLE_EDIT
 (SfxStringItem Param SID_STYLE_EDIT,SfxUInt16Item Family SID_STYLE_FAMILY)
 [
     AutoUpdate = FALSE,
@@ -1081,7 +1081,7 @@ SfxUInt16Item EditStyle SID_STYLE_EDIT
 ]
 
 
-SfxUInt16Item HideStyle SID_STYLE_HIDE
+SfxVoidItem HideStyle SID_STYLE_HIDE
 (SfxStringItem Param SID_STYLE_HIDE,SfxUInt16Item Family SID_STYLE_FAMILY)
 [
     AutoUpdate = FALSE,
@@ -1099,7 +1099,7 @@ SfxUInt16Item HideStyle SID_STYLE_HIDE
 ]
 
 
-SfxUInt16Item ShowStyle SID_STYLE_SHOW
+SfxVoidItem ShowStyle SID_STYLE_SHOW
 (SfxStringItem Param SID_STYLE_SHOW,SfxUInt16Item Family SID_STYLE_FAMILY)
 [
     AutoUpdate = FALSE,
@@ -1417,7 +1417,7 @@ SfxVoidItem Zoom50Percent SID_ZOOM_50_PERCENT
 ]
 
 
-SfxObjectItem GetFrameWindow SID_FILLFRAME
+SfxVoidItem GetFrameWindow SID_FILLFRAME
 (SfxStringItem WindowName SID_FILLFRAME)
 [
     AutoUpdate = FALSE,
@@ -1923,7 +1923,7 @@ SfxBoolItem HyperlinkDialog SID_HYPERLINK_DIALOG
 ]
 
 
-SfxBoolItem InsertDoc SID_INSERTDOC
+SfxVoidItem InsertDoc SID_INSERTDOC
 (SfxStringItem Name SID_INSERTDOC,SfxStringItem Filter FN_PARAM_1)
 [
     AutoUpdate = FALSE,
@@ -2005,10 +2005,9 @@ SfxBoolItem IsLoadingImages SID_IMG_LOADING
 ]
 
 
-SfxBoolItem IsPrinting SID_PRINTOUT
+SfxVoidItem PrintOut SID_PRINTOUT
+(SfxInt16Item copies SID_PRINT_COPIES,SfxBoolItem silent SID_SILENT)
 [
-    SfxVoidItem PrintOut(SfxInt16Item copies SID_PRINT_COPIES,SfxBoolItem silent SID_SILENT);
-
     AutoUpdate = FALSE,
     FastCall = FALSE,
     ReadOnlyDoc = TRUE,
@@ -2017,6 +2016,7 @@ SfxBoolItem IsPrinting SID_PRINTOUT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
+    SlotType = SfxBoolItem
 
     AccelConfig = FALSE,
     MenuConfig = FALSE,
@@ -2062,7 +2062,7 @@ SfxStringItem Keywords SID_DOCINFO_KEYWORDS
 ]
 
 
-SfxStringItem LibLoaded SID_BASICIDE_LIBLOADED
+SfxVoidItem LibLoaded SID_BASICIDE_LIBLOADED
 (SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
 [
     AutoUpdate = FALSE,
@@ -2082,7 +2082,7 @@ SfxStringItem LibLoaded SID_BASICIDE_LIBLOADED
 ]
 
 
-SfxStringItem LibRemoved SID_BASICIDE_LIBREMOVED
+SfxVoidItem LibRemoved SID_BASICIDE_LIBREMOVED
 (SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
 [
     AutoUpdate = FALSE,
@@ -2102,7 +2102,7 @@ SfxStringItem LibRemoved SID_BASICIDE_LIBREMOVED
 ]
 
 
-SfxStringItem LibSelect SID_BASICIDE_LIBSELECTED
+SfxVoidItem LibSelect SID_BASICIDE_LIBSELECTED
 (SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
 [
     AutoUpdate = FALSE,
@@ -2404,7 +2404,7 @@ SfxVoidItem MatchGroup SID_BASICIDE_MATCHGROUP
     GroupId = GID_MACRO;
 ]
 
-SfxInt32Item MergeDocuments SID_DOCUMENT_MERGE
+SfxVoidItem MergeDocuments SID_DOCUMENT_MERGE
 (SfxStringItem URL SID_FILE_NAME,SfxInt16Item Version SID_VERSION)
 [
     AutoUpdate = FALSE,
@@ -2585,7 +2585,7 @@ SfxBoolItem Menubar SID_MENUBAR
     GroupId = GID_VIEW;
 ]
 
-SfxBoolItem Notebookbar SID_NOTEBOOKBAR
+SfxVoidItem Notebookbar SID_NOTEBOOKBAR
 (SfxStringItem File SID_NOTEBOOKBAR)
 [
     AutoUpdate = TRUE,
@@ -2660,7 +2660,7 @@ SfxVoidItem NewModule SID_BASICIDE_NEWMODULE
     GroupId = GID_MACRO;
 ]
 
-SfxUInt16Item NewStyle SID_STYLE_NEW
+SfxVoidItem NewStyle SID_STYLE_NEW
 (SfxStringItem Param SID_STYLE_NEW,SfxUInt16Item Family SID_STYLE_FAMILY)
 [
     AutoUpdate = FALSE,
@@ -2715,7 +2715,7 @@ SfxVoidItem ObjectCatalog SID_BASICIDE_OBJCAT
 ]
 
 
-SfxStringItem ObjectMenue SID_OBJECT
+SfxVoidItem ObjectMenue SID_OBJECT
 (SfxInt16Item VerbID SID_OBJECT)
 [
     AutoUpdate = FALSE,
@@ -2735,7 +2735,7 @@ SfxStringItem ObjectMenue SID_OBJECT
 ]
 
 
-SfxObjectItem Open SID_OPENDOC
+SfxVoidItem Open SID_OPENDOC
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem OpenFlags SID_OPTIONS,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION,SfxStringItem Referer SID_REFERER,SfxStringItem SuggestedSaveAsDir SID_DEFAULTFILEPATH,SfxStringItem SuggestedSaveAsName SID_DEFAULTFILENAME)
 [
     AutoUpdate = FALSE,
@@ -2753,7 +2753,7 @@ SfxObjectItem Open SID_OPENDOC
     GroupId = GID_APPLICATION;
 ]
 
-SfxObjectItem OpenRemote SID_OPENREMOTE
+SfxVoidItem OpenRemote SID_OPENREMOTE
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem OpenFlags SID_OPTIONS,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION,SfxStringItem Referer SID_REFERER,SfxStringItem SuggestedSaveAsDir SID_DEFAULTFILEPATH,SfxStringItem SuggestedSaveAsName SID_DEFAULTFILENAME)
 [
     AutoUpdate = FALSE,
@@ -2771,7 +2771,7 @@ SfxObjectItem OpenRemote SID_OPENREMOTE
     GroupId = GID_APPLICATION;
 ]
 
-SfxObjectItem SignPDF SID_SIGNPDF
+SfxVoidItem SignPDF SID_SIGNPDF
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem OpenFlags SID_OPTIONS,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION,SfxStringItem Referer SID_REFERER,SfxStringItem SuggestedSaveAsDir SID_DEFAULTFILEPATH,SfxStringItem SuggestedSaveAsName SID_DEFAULTFILENAME)
 [
     AutoUpdate = FALSE,
@@ -2789,7 +2789,7 @@ SfxObjectItem SignPDF SID_SIGNPDF
     GroupId = GID_APPLICATION;
 ]
 
-SfxObjectItem WebHtml SID_WEBHTML
+SfxVoidItem WebHtml SID_WEBHTML
 ()
 [
     AutoUpdate = FALSE,
@@ -2808,7 +2808,7 @@ SfxObjectItem WebHtml SID_WEBHTML
 ]
 
 
-SfxObjectItem OpenHyperlink SID_OPENHYPERLINK
+SfxVoidItem OpenHyperlink SID_OPENHYPERLINK
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem OpenFlags SID_OPTIONS,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION,SfxStringItem Referer SID_REFERER)
 [
     AutoUpdate = FALSE,
@@ -2846,7 +2846,7 @@ SfxStringItem DocInfoTitle SID_DOCINFO_TITLE
 ]
 
 
-SfxObjectItem OpenTemplate SID_OPENTEMPLATE
+SfxVoidItem OpenTemplate SID_OPENTEMPLATE
 (SfxStringItem Region SID_TEMPLATE_REGIONNAME,SfxStringItem Name SID_TEMPLATE_NAME)
 [
     AutoUpdate = FALSE,
@@ -3053,7 +3053,7 @@ SfxVoidItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS
 ]
 
 
-SfxInt16Item PasteSpecial SID_PASTE_SPECIAL
+SfxVoidItem PasteSpecial SID_PASTE_SPECIAL
 (SfxUInt32Item Format SID_PASTE_SPECIAL)
 [
     AutoUpdate = FALSE,
@@ -3160,7 +3160,7 @@ SfxVoidItem PickList SID_PICKLIST
 ]
 
 
-SfxBoolItem Print SID_PRINTDOC
+SfxVoidItem Print SID_PRINTDOC
 (SfxStringItem PrinterName SID_PRINTER_NAME,SfxStringItem FileName SID_FILE_NAME,SfxInt16Item Copies SID_PRINT_COPIES,SfxStringItem RangeText SID_PRINT_PAGES,SfxBoolItem Selection SID_SELECTION,SfxBoolItem Asynchron SID_ASYNCHRON,SfxBoolItem Collate SID_PRINT_COLLATE,SfxBoolItem Silent SID_SILENT)
 [
     AutoUpdate = FALSE,
@@ -3179,7 +3179,7 @@ SfxBoolItem Print SID_PRINTDOC
 ]
 
 
-SfxBoolItem PrintDefault SID_PRINTDOCDIRECT
+SfxVoidItem PrintDefault SID_PRINTDOCDIRECT
 ()
 [
     AutoUpdate = FALSE,
@@ -3390,7 +3390,7 @@ SfxVoidItem Redo SID_REDO
     GroupId = GID_EDIT;
 ]
 
-SfxBoolItem Reload SID_RELOAD
+SfxVoidItem Reload SID_RELOAD
 ()
 [
     AutoUpdate = TRUE,
@@ -3467,10 +3467,9 @@ SfxVoidItem Repaint SID_REPAINT
 ]
 
 
-SfxStringItem RepeatAction SID_REPEAT
+SfxVoidItem Repeat SID_REPEAT
+()
 [
-    SfxVoidItem Repeat();
-
     AutoUpdate = FALSE,
     FastCall = FALSE,
     ReadOnlyDoc = FALSE,
@@ -3479,6 +3478,7 @@ SfxStringItem RepeatAction SID_REPEAT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
+    SlotType = SfxStringItem
 
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -3540,7 +3540,7 @@ SfxVoidItem SaveSimple SID_SAVESIMPLE
     GroupId = GID_DOCUMENT;
 ]
 
-SfxBoolItem Save SID_SAVEDOC
+SfxVoidItem Save SID_SAVEDOC
 (SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem Author SID_DOCINFO_AUTHOR,SfxBoolItem DontTerminateEdit FN_PARAM_1)
 [
     AutoUpdate = FALSE,
@@ -3561,7 +3561,7 @@ SfxBoolItem Save SID_SAVEDOC
 ]
 
 
-SfxBoolItem SaveAll SID_SAVEDOCS
+SfxVoidItem SaveAll SID_SAVEDOCS
 ()
 [
     AutoUpdate = FALSE,
@@ -3579,7 +3579,7 @@ SfxBoolItem SaveAll SID_SAVEDOCS
 ]
 
 
-SfxBoolItem SaveAs SID_SAVEASDOC
+SfxVoidItem SaveAs SID_SAVEASDOC
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxBoolItem PasswordInteraction SID_PASSWORDINTERACTION,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem VersionAuthor SID_DOCINFO_AUTHOR,SfxBoolItem Overwrite SID_OVERWRITE,SfxBoolItem Unpacked SID_UNPACK,SfxBoolItem SaveTo SID_SAVETO)
 [
     AutoUpdate = FALSE,
@@ -3598,7 +3598,7 @@ SfxBoolItem SaveAs SID_SAVEASDOC
     GroupId = GID_DOCUMENT;
 ]
 
-SfxBoolItem SaveAsRemote SID_SAVEASREMOTE
+SfxVoidItem SaveAsRemote SID_SAVEASREMOTE
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxBoolItem PasswordInteraction SID_PASSWORDINTERACTION,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem VersionAuthor SID_DOCINFO_AUTHOR,SfxBoolItem Overwrite SID_OVERWRITE,SfxBoolItem Unpacked SID_UNPACK,SfxBoolItem SaveTo SID_SAVETO)
 [
     AutoUpdate = FALSE,
@@ -3618,7 +3618,7 @@ SfxBoolItem SaveAsRemote SID_SAVEASREMOTE
 ]
 
 
-SfxBoolItem SaveAsTemplate SID_DOCTEMPLATE
+SfxVoidItem SaveAsTemplate SID_DOCTEMPLATE
 (SfxStringItem TemplateRegion SID_TEMPLATE_REGIONNAME,SfxStringItem TemplateName SID_TEMPLATE_NAME)
 [
     AutoUpdate = FALSE,
@@ -3637,7 +3637,7 @@ SfxBoolItem SaveAsTemplate SID_DOCTEMPLATE
 
 
 
-SfxBoolItem SaveACopy SID_SAVEACOPY
+SfxVoidItem SaveACopy SID_SAVEACOPY
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxBoolItem Overwrite SID_OVERWRITE, SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxBoolItem SaveACopy SID_SAVEACOPYITEM)
 [
     AutoUpdate = FALSE,
@@ -3784,7 +3784,7 @@ SfxVoidItem SbxRenamed SID_BASICIDE_SBXRENAMED
 ]
 
 
-SfxBoolItem ScrollBodyPageDown SID_MAIL_SCROLLBODY_PAGEDOWN
+SfxVoidItem ScrollBodyPageDown SID_MAIL_SCROLLBODY_PAGEDOWN
 ()
 [
     AutoUpdate = FALSE,
@@ -3894,7 +3894,7 @@ SfxVoidItem SendFax FN_FAX
 ]
 
 
-SfxBoolItem SendMail SID_MAIL_SENDDOC
+SfxVoidItem SendMail SID_MAIL_SENDDOC
 (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY )
 [
     AutoUpdate = FALSE,
@@ -3914,7 +3914,7 @@ SfxBoolItem SendMail SID_MAIL_SENDDOC
     GroupId = GID_DOCUMENT;
 ]
 
-SfxBoolItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF
+SfxVoidItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF
 (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY)
 [
     AutoUpdate = FALSE,
@@ -3934,7 +3934,7 @@ SfxBoolItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF
     GroupId = GID_DOCUMENT;
 ]
 
-SfxBoolItem SendViaBluetooth SID_BLUETOOTH_SENDDOC
+SfxVoidItem SendViaBluetooth SID_BLUETOOTH_SENDDOC
 ()
 [
     AutoUpdate = FALSE,
@@ -3955,7 +3955,7 @@ SfxBoolItem SendViaBluetooth SID_BLUETOOTH_SENDDOC
 ]
 
 
-SfxBoolItem SendMailDocAsFormat SID_MAIL_SENDDOCASFORMAT
+SfxVoidItem SendMailDocAsFormat SID_MAIL_SENDDOCASFORMAT
 (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxStringItem TypeName SID_TYPE_NAME)
 [
     AutoUpdate = FALSE,
@@ -3975,7 +3975,7 @@ SfxBoolItem SendMailDocAsFormat SID_MAIL_SENDDOCASFORMAT
     GroupId = GID_DOCUMENT;
 ]
 
-SfxBoolItem SendMailDocAsMS SID_MAIL_SENDDOCASMS
+SfxVoidItem SendMailDocAsMS SID_MAIL_SENDDOCASMS
 (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY)
 [
     AutoUpdate = FALSE,
@@ -3995,7 +3995,7 @@ SfxBoolItem SendMailDocAsMS SID_MAIL_SENDDOCASMS
     GroupId = GID_DOCUMENT;
 ]
 
-SfxBoolItem SendMailDocAsOOo SID_MAIL_SENDDOCASOOO
+SfxVoidItem SendMailDocAsOOo SID_MAIL_SENDDOCASOOO
 (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY)
 [
     AutoUpdate = FALSE,
@@ -4237,10 +4237,9 @@ SfxVoidItem StylePreview SID_STYLE_PREVIEW
 ]
 
 
-SfxTemplateItem StyleApplyState SID_STYLE_APPLY
+SfxVoidItem StyleApply SID_STYLE_APPLY
+(SfxStringItem Template SID_STYLE_APPLY,SfxUInt16Item Family SID_STYLE_FAMILY,SfxStringItem FamilyName SID_STYLE_FAMILYNAME,SfxStringItem Style SID_APPLY_STYLE)
 [
-    SfxUInt16Item StyleApply(SfxStringItem Template SID_STYLE_APPLY,SfxUInt16Item Family SID_STYLE_FAMILY,SfxStringItem FamilyName SID_STYLE_FAMILYNAME,SfxStringItem Style SID_APPLY_STYLE);
-
     AutoUpdate = FALSE,
     FastCall = FALSE,
     ReadOnlyDoc = FALSE,
@@ -4249,6 +4248,7 @@ SfxTemplateItem StyleApplyState SID_STYLE_APPLY
     RecordAbsolute = FALSE,
     RecordPerSet;
 
+    SlotType = SfxTemplateItem
 
     AccelConfig = FALSE,
     MenuConfig = FALSE,
@@ -4753,7 +4753,7 @@ SfxVoidItem ZoomToolBox SID_ZOOM_TOOLBOX
 ]
 
 
-SfxBoolItem ExportTo SID_EXPORTDOC
+SfxVoidItem ExportTo SID_EXPORTDOC
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxBoolItem Overwrite SID_OVERWRITE, SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxBoolItem SaveACopy SID_SAVEACOPYITEM)
 [
     AutoUpdate = FALSE,
@@ -4771,7 +4771,7 @@ SfxBoolItem ExportTo SID_EXPORTDOC
 ]
 
 
-SfxBoolItem ExportToPDF SID_EXPORTDOCASPDF
+SfxVoidItem ExportToPDF SID_EXPORTDOCASPDF
 (SfxStringItem URL SID_FILE_NAME, SfxStringItem FilterName SID_FILTER_NAME)
 [
     AutoUpdate = FALSE,
@@ -4788,7 +4788,7 @@ SfxBoolItem ExportToPDF SID_EXPORTDOCASPDF
     GroupId = GID_DOCUMENT;
 ]
 
-SfxBoolItem ExportDirectToPDF SID_DIRECTEXPORTDOCASPDF
+SfxVoidItem ExportDirectToPDF SID_DIRECTEXPORTDOCASPDF
 (SfxStringItem URL SID_FILE_NAME, SfxStringItem FilterName SID_FILTER_NAME)
 [
     AutoUpdate = FALSE,
@@ -4961,7 +4961,7 @@ SfxVoidItem InternetDialog SID_INET_DLG
 ]
 
 
-SfxBoolItem CheckPLZ SID_OFFICE_CHECK_PLZ
+SfxVoidItem CheckPLZ SID_OFFICE_CHECK_PLZ
 (SfxStringItem PLZ SID_OFFICE_CHECK_PLZ)
 [
     AutoUpdate = FALSE,
@@ -5090,7 +5090,7 @@ SfxVoidItem BibliographyComponent SID_COMP_BIBLIOGRAPHY
 ]
 
 
-SfxBoolItem CheckPLZ SID_OFFICE_CHECK_PLZ
+SfxVoidItem CheckPLZ SID_OFFICE_CHECK_PLZ
 (SfxStringItem PLZ SID_OFFICE_CHECK_PLZ)
 [
     AutoUpdate = FALSE,
@@ -5141,7 +5141,7 @@ SfxVoidItem OptionsTreeDialog SID_OPTIONS_TREEDIALOG
     GroupId = GID_OPTIONS;
 ]
 
-SfxBoolItem TerminateInplaceActivation SID_TERMINATE_INPLACEACTIVATION
+SfxVoidItem TerminateInplaceActivation SID_TERMINATE_INPLACEACTIVATION
 ()
 [
     AutoUpdate = FALSE,
@@ -5225,7 +5225,7 @@ SfxVoidItem AVMediaPlayer SID_AVMEDIA_PLAYER
     GroupId = GID_APPLICATION;
 ]
 
-SfxStringItem InsertAVMedia SID_INSERT_AVMEDIA
+SfxVoidItem InsertAVMedia SID_INSERT_AVMEDIA
 ()
 [
     AutoUpdate = FALSE,
@@ -5468,7 +5468,7 @@ SfxBoolItem DockingWindow9 SID_DOCKWIN_9
 ]
 
 
-SfxInt16Item PasteUnformatted SID_PASTE_UNFORMATTED
+SfxVoidItem PasteUnformatted SID_PASTE_UNFORMATTED
 ()
 [
     AutoUpdate = FALSE,
@@ -5488,7 +5488,7 @@ SfxInt16Item PasteUnformatted SID_PASTE_UNFORMATTED
 
 
 // call thesaurus dialog from context menu
-SfxInt16Item ThesaurusFromContext SID_THES
+SfxVoidItem ThesaurusFromContext SID_THES
 (SfxStringItem WordReplace SID_THES)
 [
     AutoUpdate = FALSE,
@@ -5525,7 +5525,7 @@ SvxZoomItem Zoom SID_ATTR_ZOOM
     GroupId = GID_VIEW;
 ]
 
-SfxStringItem Insert3DModel SID_INSERT_3DMODEL
+SfxVoidItem Insert3DModel SID_INSERT_3DMODEL
 ()
 [
     AutoUpdate = FALSE,
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index eb9350b8e8ea..e23ff4d95320 100644
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -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,
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 61ee39618df3..92e42a631c0c 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -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
+]
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
index 00cdf2f4de54..d2906533e0bf 100644
--- a/sw/sdi/_basesh.sdi
+++ b/sw/sdi/_basesh.sdi
@@ -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";
     ]
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 3af46d13f5e6..7b92648efdcb 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -1214,7 +1214,7 @@ SfxVoidItem ExecuteMacroField FN_EXECUTE_MACROFIELD
     GroupId = GID_MACRO;
 ]
 
-SfxBoolItem ExpandGlossary FN_EXPAND_GLOSSARY
+SfxVoidItem ExpandGlossary FN_EXPAND_GLOSSARY
 ()
 [
     AutoUpdate = FALSE,
@@ -1411,7 +1411,7 @@ SfxVoidItem FrameDialog FN_FORMAT_FRAME_DLG
     GroupId = GID_FRAME;
 ]
 
-SfxBoolItem GoDown FN_LINE_DOWN
+SfxVoidItem GoDown FN_LINE_DOWN
 (SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select FN_PARAM_MOVE_SELECTION)
 [
     AutoUpdate = FALSE,
@@ -1428,7 +1428,7 @@ SfxBoolItem GoDown FN_LINE_DOWN
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoLeft FN_CHAR_LEFT
+SfxVoidItem GoLeft FN_CHAR_LEFT
 (SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select FN_PARAM_MOVE_SELECTION)
 [
     AutoUpdate = FALSE,
@@ -1445,7 +1445,7 @@ SfxBoolItem GoLeft FN_CHAR_LEFT
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoRight FN_CHAR_RIGHT
+SfxVoidItem GoRight FN_CHAR_RIGHT
 (SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select FN_PARAM_MOVE_SELECTION)
 [
     AutoUpdate = FALSE,
@@ -1513,7 +1513,7 @@ SfxVoidItem GoToEndOfColumn FN_END_OF_COLUMN
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToEndOfDoc FN_END_OF_DOCUMENT
+SfxVoidItem GoToEndOfDoc FN_END_OF_DOCUMENT
 ()
 [
     AutoUpdate = FALSE,
@@ -1530,7 +1530,7 @@ SfxBoolItem GoToEndOfDoc FN_END_OF_DOCUMENT
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToEndOfLine FN_END_OF_LINE
+SfxVoidItem GoToEndOfLine FN_END_OF_LINE
 ()
 [
     AutoUpdate = FALSE,
@@ -1632,7 +1632,7 @@ SfxVoidItem GoToEndOfPageSel FN_END_OF_PAGE_SEL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToEndOfPara FN_END_OF_PARA
+SfxVoidItem GoToEndOfPara FN_END_OF_PARA
 ()
 [
     AutoUpdate = FALSE,
@@ -1700,7 +1700,7 @@ SfxVoidItem GoToEndOfPrevPageSel FN_END_OF_PREV_PAGE_SEL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoNextIndexMark FN_NEXT_TOXMARK
+SfxVoidItem GotoNextIndexMark FN_NEXT_TOXMARK
 ()
 [
     AutoUpdate = FALSE,
@@ -1717,7 +1717,7 @@ SfxBoolItem GotoNextIndexMark FN_NEXT_TOXMARK
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoNextInputField FN_GOTO_NEXT_INPUTFLD
+SfxVoidItem GotoNextInputField FN_GOTO_NEXT_INPUTFLD
 ()
 [
     AutoUpdate = FALSE,
@@ -1734,7 +1734,7 @@ SfxBoolItem GotoNextInputField FN_GOTO_NEXT_INPUTFLD
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoNextObject FN_GOTO_NEXT_OBJ
+SfxVoidItem GotoNextObject FN_GOTO_NEXT_OBJ
 ()
 [
     AutoUpdate = FALSE,
@@ -1751,7 +1751,7 @@ SfxBoolItem GotoNextObject FN_GOTO_NEXT_OBJ
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToNextPara FN_NEXT_PARA
+SfxVoidItem GoToNextPara FN_NEXT_PARA
 ()
 [
     AutoUpdate = FALSE,
@@ -1768,7 +1768,7 @@ SfxBoolItem GoToNextPara FN_NEXT_PARA
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoNextPlacemarker FN_GOTO_NEXT_MARK
+SfxVoidItem GotoNextPlacemarker FN_GOTO_NEXT_MARK
 ()
 [
     AutoUpdate = FALSE,
@@ -1785,7 +1785,7 @@ SfxBoolItem GotoNextPlacemarker FN_GOTO_NEXT_MARK
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToNextSentence FN_NEXT_SENT
+SfxVoidItem GoToNextSentence FN_NEXT_SENT
 ()
 [
     AutoUpdate = FALSE,
@@ -1819,7 +1819,7 @@ SfxVoidItem GotoNextSentenceSel FN_NEXT_SENT_SEL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoNextTableFormula FN_NEXT_TBLFML
+SfxVoidItem GotoNextTableFormula FN_NEXT_TBLFML
 ()
 [
     AutoUpdate = FALSE,
@@ -1836,7 +1836,7 @@ SfxBoolItem GotoNextTableFormula FN_NEXT_TBLFML
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToNextWord FN_NEXT_WORD
+SfxVoidItem GoToNextWord FN_NEXT_WORD
 ()
 [
     AutoUpdate = FALSE,
@@ -1853,7 +1853,7 @@ SfxBoolItem GoToNextWord FN_NEXT_WORD
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoNextWrongTableFormula FN_NEXT_TBLFML_ERR
+SfxVoidItem GotoNextWrongTableFormula FN_NEXT_TBLFML_ERR
 ()
 [
     AutoUpdate = FALSE,
@@ -1887,7 +1887,7 @@ SfxVoidItem GotoPage FN_GOTO_PAGE
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoPrevIndexMark FN_PREV_TOXMARK
+SfxVoidItem GotoPrevIndexMark FN_PREV_TOXMARK
 ()
 [
     AutoUpdate = FALSE,
@@ -1904,7 +1904,7 @@ SfxBoolItem GotoPrevIndexMark FN_PREV_TOXMARK
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoPrevInputField FN_GOTO_PREV_INPUTFLD
+SfxVoidItem GotoPrevInputField FN_GOTO_PREV_INPUTFLD
 ()
 [
     AutoUpdate = FALSE,
@@ -1921,7 +1921,7 @@ SfxBoolItem GotoPrevInputField FN_GOTO_PREV_INPUTFLD
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoPrevObject FN_GOTO_PREV_OBJ
+SfxVoidItem GotoPrevObject FN_GOTO_PREV_OBJ
 ()
 [
     AutoUpdate = FALSE,
@@ -1938,7 +1938,7 @@ SfxBoolItem GotoPrevObject FN_GOTO_PREV_OBJ
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToPrevPara FN_PREV_PARA
+SfxVoidItem GoToPrevPara FN_PREV_PARA
 ()
 [
     AutoUpdate = FALSE,
@@ -1955,7 +1955,7 @@ SfxBoolItem GoToPrevPara FN_PREV_PARA
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoPrevPlacemarker FN_GOTO_PREV_MARK
+SfxVoidItem GotoPrevPlacemarker FN_GOTO_PREV_MARK
 ()
 [
     AutoUpdate = FALSE,
@@ -1972,7 +1972,7 @@ SfxBoolItem GotoPrevPlacemarker FN_GOTO_PREV_MARK
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToPrevSentence FN_PREV_SENT
+SfxVoidItem GoToPrevSentence FN_PREV_SENT
 ()
 [
     AutoUpdate = FALSE,
@@ -2006,7 +2006,7 @@ SfxVoidItem GotoPrevSentenceSel FN_PREV_SENT_SEL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoPrevTableFormula FN_PREV_TBLFML
+SfxVoidItem GotoPrevTableFormula FN_PREV_TBLFML
 ()
 [
     AutoUpdate = FALSE,
@@ -2023,7 +2023,7 @@ SfxBoolItem GotoPrevTableFormula FN_PREV_TBLFML
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToPrevWord FN_PREV_WORD
+SfxVoidItem GoToPrevWord FN_PREV_WORD
 ()
 [
     AutoUpdate = FALSE,
@@ -2040,7 +2040,7 @@ SfxBoolItem GoToPrevWord FN_PREV_WORD
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GotoPrevWrongTableFormula FN_PREV_TBLFML_ERR
+SfxVoidItem GotoPrevWrongTableFormula FN_PREV_TBLFML_ERR
 ()
 [
     AutoUpdate = FALSE,
@@ -2091,7 +2091,7 @@ SfxVoidItem GoToStartOfColumn FN_START_OF_COLUMN
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToStartOfDoc FN_START_OF_DOCUMENT
+SfxVoidItem GoToStartOfDoc FN_START_OF_DOCUMENT
 ()
 [
     AutoUpdate = FALSE,
@@ -2108,7 +2108,7 @@ SfxBoolItem GoToStartOfDoc FN_START_OF_DOCUMENT
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToStartOfLine FN_START_OF_LINE
+SfxVoidItem GoToStartOfLine FN_START_OF_LINE
 ()
 [
     AutoUpdate = FALSE,
@@ -2210,7 +2210,7 @@ SfxVoidItem GoToStartOfPageSel FN_START_OF_PAGE_SEL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoToStartOfPara FN_START_OF_PARA
+SfxVoidItem GoToStartOfPara FN_START_OF_PARA
 ()
 [
     AutoUpdate = FALSE,
@@ -2278,7 +2278,7 @@ SfxVoidItem GoToStartOfPrevPageSel FN_START_OF_PREV_PAGE_SEL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem GoUp FN_LINE_UP
+SfxVoidItem GoUp FN_LINE_UP
 (SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select FN_PARAM_MOVE_SELECTION)
 [
     AutoUpdate = FALSE,
@@ -2685,7 +2685,7 @@ SfxVoidItem InsertColumnsAfter FN_TABLE_INSERT_COL_AFTER
     GroupId = GID_TABLE;
 ]
 
-SfxStringItem InsertSection FN_INSERT_REGION
+SfxVoidItem InsertSection FN_INSERT_REGION
 (SfxUInt16Item Columns SID_ATTR_COLUMNS,SfxStringItem RegionName FN_PARAM_REGION_NAME,SfxStringItem RegionCondition FN_PARAM_REGION_CONDITION,SfxBoolItem RegionHidden FN_PARAM_REGION_HIDDEN,SfxBoolItem RegionProtect FN_PARAM_REGION_PROTECT,SfxStringItem LinkName FN_PARAM_1,SfxStringItem FilterName FN_PARAM_2,SfxStringItem SubRegion FN_PARAM_3)
 [
     AutoUpdate = FALSE,
@@ -2775,7 +2775,7 @@ SfxVoidItem InsertEnvelope FN_ENVELOP
     GroupId = GID_INSERT;
 ]
 
-SfxBoolItem InsertField FN_INSERT_FIELD
+SfxVoidItem InsertField FN_INSERT_FIELD
 (SfxUInt16Item Type FN_PARAM_FIELD_TYPE,SfxUInt16Item SubType FN_PARAM_FIELD_SUBTYPE,SfxStringItem Name FN_INSERT_FIELD,SfxStringItem Content FN_PARAM_FIELD_CONTENT,SfxUInt32Item Format FN_PARAM_FIELD_FORMAT,SfxStringItem Separator FN_PARAM_3)
 [
     AutoUpdate = FALSE,
@@ -3433,7 +3433,7 @@ SfxVoidItem JumpToHeader FN_TO_HEADER
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem JumpToNextBookmark FN_NEXT_BOOKMARK
+SfxVoidItem JumpToNextBookmark FN_NEXT_BOOKMARK
 ()
 [
     AutoUpdate = FALSE,
@@ -3450,7 +3450,7 @@ SfxBoolItem JumpToNextBookmark FN_NEXT_BOOKMARK
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem JumpToNextFootnote FN_NEXT_FOOTNOTE
+SfxVoidItem JumpToNextFootnote FN_NEXT_FOOTNOTE
 ()
 [
     AutoUpdate = FALSE,
@@ -3467,7 +3467,7 @@ SfxBoolItem JumpToNextFootnote FN_NEXT_FOOTNOTE
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem JumpToNextFrame FN_CNTNT_TO_NEXT_FRAME
+SfxVoidItem JumpToNextFrame FN_CNTNT_TO_NEXT_FRAME
 ()
 [
     AutoUpdate = FALSE,
@@ -3484,7 +3484,7 @@ SfxBoolItem JumpToNextFrame FN_CNTNT_TO_NEXT_FRAME
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem JumpToNextRegion FN_GOTO_NEXT_REGION
+SfxVoidItem JumpToNextRegion FN_GOTO_NEXT_REGION
 ()
 [
     AutoUpdate = FALSE,
@@ -3501,7 +3501,7 @@ SfxBoolItem JumpToNextRegion FN_GOTO_NEXT_REGION
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem JumpToNextTable FN_NEXT_TABLE
+SfxVoidItem JumpToNextTable FN_NEXT_TABLE
 ()
 [
     AutoUpdate = FALSE,
@@ -3518,7 +3518,7 @@ SfxBoolItem JumpToNextTable FN_NEXT_TABLE
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem JumpToPrevBookmark FN_PREV_BOOKMARK
+SfxVoidItem JumpToPrevBookmark FN_PREV_BOOKMARK
 ()
 [
     AutoUpdate = FALSE,
@@ -3535,7 +3535,7 @@ SfxBoolItem JumpToPrevBookmark FN_PREV_BOOKMARK
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem JumpToPrevFootnote FN_PREV_FOOTNOTE
+SfxVoidItem JumpToPrevFootnote FN_PREV_FOOTNOTE
 ()
 [
     AutoUpdate = FALSE,
@@ -3552,7 +3552,7 @@ SfxBoolItem JumpToPrevFootnote FN_PREV_FOOTNOTE
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem JumpToPrevRegion FN_GOTO_PREV_REGION
+SfxVoidItem JumpToPrevRegion FN_GOTO_PREV_REGION
 ()
 [
     AutoUpdate = FALSE,
@@ -3569,7 +3569,7 @@ SfxBoolItem JumpToPrevRegion FN_GOTO_PREV_REGION
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem JumpToPrevTable FN_PREV_TABLE
+SfxVoidItem JumpToPrevTable FN_PREV_TABLE
 ()
 [
     AutoUpdate = FALSE,
@@ -3964,7 +3964,7 @@ SfxVoidItem MailMergeEmailDocuments FN_MAILMERGE_EMAIL_DOCUMENTS
     GroupId = GID_DOCUMENT;
 ]
 
-SfxBoolItem MergeTable FN_TABLE_MERGE_TABLE
+SfxVoidItem MergeTable FN_TABLE_MERGE_TABLE
 ()
 [
     AutoUpdate = FALSE,
@@ -4066,7 +4066,7 @@ SfxVoidItem ApplyStyleTextbody FN_FORMAT_APPLY_TEXTBODY
     GroupId = GID_FORMAT;
 ]
 
-SfxBoolItem MirrorGraphicOnEvenPages FN_GRAPHIC_MIRROR_ON_EVEN_PAGES
+SfxVoidItem MirrorGraphicOnEvenPages FN_GRAPHIC_MIRROR_ON_EVEN_PAGES
 ()
 [
     AutoUpdate = TRUE,
@@ -4085,7 +4085,7 @@ SfxBoolItem MirrorGraphicOnEvenPages FN_GRAPHIC_MIRROR_ON_EVEN_PAGES
     GroupId = GID_FORMAT;
 ]
 
-SfxBoolItem MirrorOnEvenPages FN_FRAME_MIRROR_ON_EVEN_PAGES
+SfxVoidItem MirrorOnEvenPages FN_FRAME_MIRROR_ON_EVEN_PAGES
 ()
 [
     AutoUpdate = TRUE,
@@ -4213,7 +4213,7 @@ SfxVoidItem NameGroup FN_NAME_SHAPE
     GroupId = GID_FORMAT;
 ]
 
-SfxBoolItem NewGlobalDoc FN_NEW_GLOBAL_DOC
+SfxVoidItem NewGlobalDoc FN_NEW_GLOBAL_DOC
 (SfxStringItem FileName FN_NEW_GLOBAL_DOC,SfxStringItem TemplateName SID_TEMPLATE_NAME)
 [
     AutoUpdate = FALSE,
@@ -4230,7 +4230,7 @@ SfxBoolItem NewGlobalDoc FN_NEW_GLOBAL_DOC
     GroupId = GID_APPLICATION;
 ]
 
-SfxBoolItem NewHtmlDoc FN_NEW_HTML_DOC
+SfxVoidItem NewHtmlDoc FN_NEW_HTML_DOC
 (SfxStringItem FileName FN_NEW_HTML_DOC,SfxStringItem TemplateName SID_TEMPLATE_NAME)
 [
     AutoUpdate = FALSE,
@@ -4595,10 +4595,9 @@ SfxVoidItem PageDownSel FN_PAGEDOWN_SEL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxUInt16Item PageOffset FN_CHANGE_PAGENUM
+SfxVoidItem PageOffsetDialog FN_CHANGE_PAGENUM
+(SfxUInt16Item nOffset FN_CHANGE_PAGENUM)
 [
-    SfxVoidItem PageOffsetDialog(SfxUInt16Item nOffset FN_CHANGE_PAGENUM);
-
     AutoUpdate = FALSE,
     FastCall = TRUE,
     ReadOnlyDoc = FALSE,
@@ -4608,6 +4607,7 @@ SfxUInt16Item PageOffset FN_CHANGE_PAGENUM
     RecordPerSet;
     Asynchron;
 
+    SlotType = SfxUInt16Item
 
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -4844,7 +4844,7 @@ SfxVoidItem Repaginate FN_REPAGINATE
     GroupId = GID_FORMAT;
 ]
 
-SfxBoolItem RepeatSearch FN_REPEAT_SEARCH
+SfxVoidItem RepeatSearch FN_REPEAT_SEARCH
 ( SfxBoolItem Quiet SID_SEARCH_QUIET )
 [
     AutoUpdate = FALSE,
@@ -5703,7 +5703,7 @@ SfxStringItem StatePageNumber FN_STAT_PAGE
     GroupId = GID_VIEW;
 ]
 
-SfxStringItem StateZoom FN_STAT_ZOOM
+SfxVoidItem StateZoom FN_STAT_ZOOM
 ()
 [
     AutoUpdate = FALSE,
@@ -5842,7 +5842,7 @@ SfxVoidItem SwUpdate FN_SBA_BRW_UPDATE
     GroupId = GID_DATA;
 ]
 
-SfxBoolItem SynchronizeLabelsDlg FN_SYNC_LABELS
+SfxVoidItem SynchronizeLabelsDlg FN_SYNC_LABELS
 ()
 [
     AutoUpdate = FALSE,
@@ -6322,7 +6322,7 @@ SfxVoidItem WordRightSel FN_NEXT_WORD_SEL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem WrapAnchorOnly FN_WRAP_ANCHOR_ONLY
+SfxVoidItem WrapAnchorOnly FN_WRAP_ANCHOR_ONLY
 ()
 [
     AutoUpdate = TRUE,
@@ -6339,7 +6339,7 @@ SfxBoolItem WrapAnchorOnly FN_WRAP_ANCHOR_ONLY
     GroupId = GID_FRAME;
 ]
 
-SfxBoolItem WrapContour FN_FRAME_WRAP_CONTOUR
+SfxVoidItem WrapContour FN_FRAME_WRAP_CONTOUR
 ()
 [
     AutoUpdate = TRUE,
@@ -6356,7 +6356,7 @@ SfxBoolItem WrapContour FN_FRAME_WRAP_CONTOUR
     GroupId = GID_FRAME;
 ]
 
-SfxBoolItem WrapIdeal FN_FRAME_WRAP_IDEAL
+SfxVoidItem WrapIdeal FN_FRAME_WRAP_IDEAL
 ()
 [
     AutoUpdate = TRUE,
@@ -6373,7 +6373,7 @@ SfxBoolItem WrapIdeal FN_FRAME_WRAP_IDEAL
     GroupId = GID_FRAME;
 ]
 
-SfxBoolItem WrapLeft FN_FRAME_WRAP_LEFT
+SfxVoidItem WrapLeft FN_FRAME_WRAP_LEFT
 ()
 [
     AutoUpdate = TRUE,
@@ -6390,7 +6390,7 @@ SfxBoolItem WrapLeft FN_FRAME_WRAP_LEFT
     GroupId = GID_FRAME;
 ]
 
-SfxBoolItem WrapOff FN_FRAME_NOWRAP
+SfxVoidItem WrapOff FN_FRAME_NOWRAP
 ()
 [
     AutoUpdate = TRUE,
@@ -6407,7 +6407,7 @@ SfxBoolItem WrapOff FN_FRAME_NOWRAP
     GroupId = GID_FRAME;
 ]
 
-SfxBoolItem WrapOn FN_FRAME_WRAP
+SfxVoidItem WrapOn FN_FRAME_WRAP
 ()
 [
     AutoUpdate = TRUE,
@@ -6424,7 +6424,7 @@ SfxBoolItem WrapOn FN_FRAME_WRAP
     GroupId = GID_FRAME;
 ]
 
-SfxBoolItem WrapRight FN_FRAME_WRAP_RIGHT
+SfxVoidItem WrapRight FN_FRAME_WRAP_RIGHT
 ()
 [
     AutoUpdate = TRUE,
@@ -6441,7 +6441,7 @@ SfxBoolItem WrapRight FN_FRAME_WRAP_RIGHT
     GroupId = GID_FRAME;
 ]
 
-SfxBoolItem WrapThrough FN_FRAME_WRAPTHRU
+SfxVoidItem WrapThrough FN_FRAME_WRAPTHRU
 ()
 [
     AutoUpdate = TRUE,
@@ -6458,7 +6458,7 @@ SfxBoolItem WrapThrough FN_FRAME_WRAPTHRU
     GroupId = GID_FRAME;
 ]
 
-SfxBoolItem WrapThroughTransparent FN_FRAME_WRAPTHRU_TRANSP
+SfxVoidItem WrapThroughTransparent FN_FRAME_WRAPTHRU_TRANSP
 ()
 [
     AutoUpdate = TRUE,
@@ -6755,7 +6755,7 @@ SfxBoolItem SelectTextMode FN_READONLY_SELECTION_MODE
     GroupId = GID_EDIT;
 ]
 
-SfxBoolItem InsertDBField FN_INSERT_DBFIELD
+SfxVoidItem InsertDBField FN_INSERT_DBFIELD
 (SfxUInt16Item Type FN_PARAM_FIELD_TYPE,SfxStringItem DBName FN_INSERT_DBFIELD,SfxStringItem Command FN_PARAM_1,SfxStringItem ColumnName FN_PARAM_2,SfxInt32Item CommandType FN_PARAM_3,SfxStringItem Content FN_PARAM_FIELD_CONTENT,SfxUInt32Item Format FN_PARAM_FIELD_FORMAT)
 [
     AutoUpdate = FALSE,
@@ -6772,7 +6772,7 @@ SfxBoolItem InsertDBField FN_INSERT_DBFIELD
     GroupId = GID_INSERT;
 ]
 
-SfxBoolItem JumpToNextCell FN_GOTO_NEXT_CELL
+SfxVoidItem JumpToNextCell FN_GOTO_NEXT_CELL
 (SfxBoolItem AppendLineInReadonlyFlag FN_GOTO_NEXT_CELL)
 [
     AutoUpdate = FALSE,
@@ -6789,7 +6789,7 @@ SfxBoolItem JumpToNextCell FN_GOTO_NEXT_CELL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem JumpToPrevCell FN_GOTO_PREV_CELL
+SfxVoidItem JumpToPrevCell FN_GOTO_PREV_CELL
 ()
 [
     AutoUpdate = FALSE,
@@ -6806,7 +6806,7 @@ SfxBoolItem JumpToPrevCell FN_GOTO_PREV_CELL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxBoolItem InsertFieldDataOnly FN_INSERT_FIELD_DATA_ONLY()
+SfxVoidItem InsertFieldDataOnly FN_INSERT_FIELD_DATA_ONLY()
 [
     AutoUpdate = TRUE,
     FastCall = FALSE,
@@ -6894,7 +6894,7 @@ SfxVoidItem WordCountDialog FN_WORDCOUNT_DIALOG
     GroupId = GID_OPTIONS;
 ]
 
-SfxBoolItem SendMailChildWindow FN_MAILMERGE_SENDMAIL_CHILDWINDOW
+SfxVoidItem SendMailChildWindow FN_MAILMERGE_SENDMAIL_CHILDWINDOW
 ()
 [
     AutoUpdate = FALSE,