From 1c6cb1e8386eb627adb0c70169582cc58fd76ec7 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Sun, 30 Apr 2017 12:40:20 +0300 Subject: 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 --- sfx2/sdi/sfx.sdi | 127 ++++++++++++++----------------------------------------- 1 file changed, 31 insertions(+), 96 deletions(-) (limited to 'sfx2') diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 1c4002c3ff9c..1ffd526663b5 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -191,7 +191,7 @@ SfxUInt16Item ActualStyleFamily SID_STYLE_FAMILY ] -SfxVoidItem NewDoc SID_NEWDOC +SfxStringItem NewDoc SID_NEWDOC (SfxStringItem Region SID_TEMPLATE_REGIONNAME,SfxStringItem Name SID_TEMPLATE_NAME) [ AutoUpdate = FALSE, @@ -203,8 +203,6 @@ SfxVoidItem NewDoc SID_NEWDOC RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -230,7 +228,7 @@ SfxVoidItem AddBookmark SID_CREATELINK ] -SfxVoidItem AddDirect SID_NEWDOCDIRECT +SfxStringItem AddDirect SID_NEWDOCDIRECT () [ AutoUpdate = FALSE, @@ -242,8 +240,6 @@ SfxVoidItem AddDirect SID_NEWDOCDIRECT RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -307,7 +303,7 @@ SfxStringItem Author SID_DOCINFO_AUTHOR GroupId = ; ] -SfxVoidItem AutoPilotMenu SID_AUTOPILOTMENU +SfxStringItem AutoPilotMenu SID_AUTOPILOTMENU () [ AutoUpdate = FALSE, @@ -318,8 +314,6 @@ SfxVoidItem AutoPilotMenu SID_AUTOPILOTMENU RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -497,7 +491,7 @@ SfxVoidItem BreakPointsChanged SID_BASICIDE_BRKPNTSCHANGED ] -SfxVoidItem BrowseBackward SID_BROWSE_BACKWARD +SfxStringItem BrowseBackward SID_BROWSE_BACKWARD (SfxUInt16Item nSteps SID_BROWSE_BACKWARD) [ AutoUpdate = TRUE, @@ -509,8 +503,6 @@ SfxVoidItem BrowseBackward SID_BROWSE_BACKWARD RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = FALSE, @@ -518,7 +510,7 @@ SfxVoidItem BrowseBackward SID_BROWSE_BACKWARD ] -SfxVoidItem BrowseForward SID_BROWSE_FORWARD +SfxStringItem BrowseForward SID_BROWSE_FORWARD (SfxUInt16Item nSteps SID_BROWSE_FORWARD) [ AutoUpdate = TRUE, @@ -530,8 +522,6 @@ SfxVoidItem BrowseForward SID_BROWSE_FORWARD RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = FALSE, @@ -631,7 +621,7 @@ SfxVoidItem CloseDocs SID_CLOSEDOCS ] -SfxVoidItem CloseDoc SID_CLOSEDOC +SfxStringItem CloseDoc SID_CLOSEDOC (SfxBoolItem saveChanges SID_CLOSEDOC_SAVE,SfxStringItem fileName SID_CLOSEDOC_FILENAME) [ AutoUpdate = FALSE, @@ -643,8 +633,6 @@ SfxVoidItem CloseDoc SID_CLOSEDOC RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -1174,7 +1162,7 @@ SfxStringItem FileName SID_FILE_NAME ] -SfxVoidItem FocusUrlBox SID_FOCUSURLBOX +SfxStringItem FocusUrlBox SID_FOCUSURLBOX () [ AutoUpdate = FALSE, @@ -1185,8 +1173,6 @@ SfxVoidItem FocusUrlBox SID_FOCUSURLBOX RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxStringItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = FALSE, @@ -2005,7 +1991,7 @@ SfxBoolItem IsLoadingImages SID_IMG_LOADING ] -SfxVoidItem PrintOut SID_PRINTOUT +SfxBoolItem PrintOut SID_PRINTOUT (SfxInt16Item copies SID_PRINT_COPIES,SfxBoolItem silent SID_SILENT) [ AutoUpdate = FALSE, @@ -2016,8 +2002,6 @@ SfxVoidItem PrintOut SID_PRINTOUT RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxBoolItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = FALSE, @@ -2062,7 +2046,7 @@ SfxStringItem Keywords SID_DOCINFO_KEYWORDS ] -SfxVoidItem LibLoaded SID_BASICIDE_LIBLOADED +SfxStringItem LibLoaded SID_BASICIDE_LIBLOADED (SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME) [ AutoUpdate = FALSE, @@ -2073,8 +2057,6 @@ SfxVoidItem LibLoaded SID_BASICIDE_LIBLOADED RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxStringItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = FALSE, @@ -2082,7 +2064,7 @@ SfxVoidItem LibLoaded SID_BASICIDE_LIBLOADED ] -SfxVoidItem LibRemoved SID_BASICIDE_LIBREMOVED +SfxStringItem LibRemoved SID_BASICIDE_LIBREMOVED (SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME) [ AutoUpdate = FALSE, @@ -2093,8 +2075,6 @@ SfxVoidItem LibRemoved SID_BASICIDE_LIBREMOVED RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxStringItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = FALSE, @@ -2102,7 +2082,7 @@ SfxVoidItem LibRemoved SID_BASICIDE_LIBREMOVED ] -SfxVoidItem LibSelect SID_BASICIDE_LIBSELECTED +SfxStringItem LibSelect SID_BASICIDE_LIBSELECTED (SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME) [ AutoUpdate = FALSE, @@ -2113,8 +2093,6 @@ SfxVoidItem LibSelect SID_BASICIDE_LIBSELECTED RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxStringItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = FALSE, @@ -2255,7 +2233,7 @@ SfxVoidItem LoadToolBox SID_TOOLBOXOPTIONS ] -SfxVoidItem Logout SID_LOGOUT +SfxStringItem Logout SID_LOGOUT () [ AutoUpdate = FALSE, @@ -2267,8 +2245,6 @@ SfxVoidItem Logout SID_LOGOUT RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = FALSE, @@ -2276,7 +2252,7 @@ SfxVoidItem Logout SID_LOGOUT ] -SfxVoidItem ScriptOrganizer SID_SCRIPTORGANIZER +SfxScriptOrganizerItem ScriptOrganizer SID_SCRIPTORGANIZER (SfxScriptOrganizerItem ScriptOrganizer SID_SCRIPTORGANIZER) [ AutoUpdate = FALSE, @@ -2287,8 +2263,6 @@ SfxVoidItem ScriptOrganizer SID_SCRIPTORGANIZER RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxScriptOrganizerItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -2296,7 +2270,7 @@ SfxVoidItem ScriptOrganizer SID_SCRIPTORGANIZER ] -SfxVoidItem MacroOrganizer SID_MACROORGANIZER +SfxScriptOrganizerItem MacroOrganizer SID_MACROORGANIZER (SfxUInt16Item TabId SID_MACROORGANIZER) [ AutoUpdate = FALSE, @@ -2307,8 +2281,6 @@ SfxVoidItem MacroOrganizer SID_MACROORGANIZER RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxScriptOrganizerItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -2931,9 +2903,6 @@ SfxStringItem OpenUrl SID_OPENURL RecordPerSet; Asynchron; - SlotType = SfxStringItem - - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = TRUE, @@ -3033,7 +3002,7 @@ SfxVoidItem Paste SID_PASTE ] -SfxVoidItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS +SvxClipboardFormatItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS (SfxUInt32Item SelectedFormat SID_CLIPBOARD_FORMAT_ITEMS) [ AutoUpdate = FALSE, @@ -3044,8 +3013,6 @@ SfxVoidItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS RecordAbsolute = FALSE, RecordPerSet; - SlotType = SvxClipboardFormatItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = FALSE, @@ -3275,7 +3242,7 @@ SfxVoidItem SetDocumentProperties SID_DOCINFO ] -SfxVoidItem Quit SID_QUITAPP +SfxStringItem Quit SID_QUITAPP () [ AutoUpdate = FALSE, @@ -3287,8 +3254,6 @@ SfxVoidItem Quit SID_QUITAPP RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -3371,7 +3336,7 @@ SfxBoolItem MacroRecordingFloat SID_RECORDING_FLOATWINDOW ] -SfxVoidItem Redo SID_REDO +SfxStringItem Redo SID_REDO ( SfxUInt16Item Redo SID_REDO, SfxBoolItem Repair SID_REPAIRPACKAGE ) [ AutoUpdate = FALSE, @@ -3382,15 +3347,13 @@ SfxVoidItem Redo SID_REDO RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, GroupId = GID_EDIT; ] -SfxVoidItem Reload SID_RELOAD +SfxBoolItem Reload SID_RELOAD () [ AutoUpdate = TRUE, @@ -3402,8 +3365,6 @@ SfxVoidItem Reload SID_RELOAD RecordPerSet; Asynchron; - SlotType = SfxBoolItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -3467,7 +3428,7 @@ SfxVoidItem Repaint SID_REPAINT ] -SfxVoidItem Repeat SID_REPEAT +SfxStringItem Repeat SID_REPEAT () [ AutoUpdate = FALSE, @@ -3478,8 +3439,6 @@ SfxVoidItem Repeat SID_REPEAT RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -3540,7 +3499,7 @@ SfxVoidItem SaveSimple SID_SAVESIMPLE GroupId = GID_DOCUMENT; ] -SfxVoidItem Save SID_SAVEDOC +SfxStringItem Save SID_SAVEDOC (SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem Author SID_DOCINFO_AUTHOR,SfxBoolItem DontTerminateEdit FN_PARAM_1) [ AutoUpdate = FALSE, @@ -3552,8 +3511,6 @@ SfxVoidItem Save SID_SAVEDOC RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -3579,7 +3536,7 @@ SfxVoidItem SaveAll SID_SAVEDOCS ] -SfxVoidItem SaveAs SID_SAVEASDOC +SfxStringItem 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, @@ -3590,15 +3547,13 @@ SfxVoidItem SaveAs SID_SAVEASDOC RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, GroupId = GID_DOCUMENT; ] -SfxVoidItem SaveAsRemote SID_SAVEASREMOTE +SfxStringItem 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, @@ -3609,8 +3564,6 @@ SfxVoidItem SaveAsRemote SID_SAVEASREMOTE RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -3894,7 +3847,7 @@ SfxVoidItem SendFax FN_FAX ] -SfxVoidItem SendMail SID_MAIL_SENDDOC +SfxStringItem 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, @@ -3906,15 +3859,13 @@ SfxVoidItem SendMail SID_MAIL_SENDDOC RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, GroupId = GID_DOCUMENT; ] -SfxVoidItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF +SfxStringItem 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, @@ -3926,15 +3877,13 @@ SfxVoidItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, GroupId = GID_DOCUMENT; ] -SfxVoidItem SendViaBluetooth SID_BLUETOOTH_SENDDOC +SfxStringItem SendViaBluetooth SID_BLUETOOTH_SENDDOC () [ AutoUpdate = FALSE, @@ -3946,8 +3895,6 @@ SfxVoidItem SendViaBluetooth SID_BLUETOOTH_SENDDOC RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -3955,7 +3902,7 @@ SfxVoidItem SendViaBluetooth SID_BLUETOOTH_SENDDOC ] -SfxVoidItem SendMailDocAsFormat SID_MAIL_SENDDOCASFORMAT +SfxStringItem 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, @@ -3967,15 +3914,13 @@ SfxVoidItem SendMailDocAsFormat SID_MAIL_SENDDOCASFORMAT RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = FALSE, GroupId = GID_DOCUMENT; ] -SfxVoidItem SendMailDocAsMS SID_MAIL_SENDDOCASMS +SfxStringItem 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, @@ -3987,15 +3932,13 @@ SfxVoidItem SendMailDocAsMS SID_MAIL_SENDDOCASMS RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, GroupId = GID_DOCUMENT; ] -SfxVoidItem SendMailDocAsOOo SID_MAIL_SENDDOCASOOO +SfxStringItem 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, @@ -4007,8 +3950,6 @@ SfxVoidItem SendMailDocAsOOo SID_MAIL_SENDDOCASOOO RecordPerSet; Asynchron; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -4237,7 +4178,7 @@ SfxVoidItem StylePreview SID_STYLE_PREVIEW ] -SfxVoidItem StyleApply SID_STYLE_APPLY +SfxTemplateItem StyleApply SID_STYLE_APPLY (SfxStringItem Template SID_STYLE_APPLY,SfxUInt16Item Family SID_STYLE_FAMILY,SfxStringItem FamilyName SID_STYLE_FAMILYNAME,SfxStringItem Style SID_APPLY_STYLE) [ AutoUpdate = FALSE, @@ -4248,8 +4189,6 @@ SfxVoidItem StyleApply SID_STYLE_APPLY RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxTemplateItem - AccelConfig = FALSE, MenuConfig = FALSE, ToolBoxConfig = TRUE, @@ -4441,7 +4380,7 @@ SfxVoidItem BasicIDEShowWindow SID_BASICIDE_SHOWWINDOW ] -SfxVoidItem Undo SID_UNDO +SfxStringItem Undo SID_UNDO ( SfxUInt16Item Undo SID_UNDO, SfxBoolItem Repair SID_REPAIRPACKAGE ) [ AutoUpdate = FALSE, @@ -4452,8 +4391,6 @@ SfxVoidItem Undo SID_UNDO RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxStringItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, @@ -4461,7 +4398,7 @@ SfxVoidItem Undo SID_UNDO ] -SfxVoidItem FormatPaintbrush SID_FORMATPAINTBRUSH ( SfxBoolItem PersistentCopy SID_FORMATPAINTBRUSH ) +SfxBoolItem FormatPaintbrush SID_FORMATPAINTBRUSH ( SfxBoolItem PersistentCopy SID_FORMATPAINTBRUSH ) [ AutoUpdate = TRUE, FastCall = FALSE, @@ -4471,8 +4408,6 @@ SfxVoidItem FormatPaintbrush SID_FORMATPAINTBRUSH ( SfxBoolItem PersistentCopy S RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxBoolItem - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, -- cgit