diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-27 08:12:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-28 06:41:25 +0000 |
commit | 2fc5ef74c5200bdb82cdbbc812d7ac05a9a489dd (patch) | |
tree | 932e26fbe450925af9c91991d5b48189cd905f00 | |
parent | f5738518a6ff5321d4d35d9bed4a640ae0a6ae9a (diff) |
remove unhandled SID commands from sfx2
Change-Id: I5473dbb1fdc2c3779892610ab4ea5f6146291921
Reviewed-on: https://gerrit.libreoffice.org/35742
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | idl/source/objects/slot.cxx | 2 | ||||
-rw-r--r-- | include/sfx2/sfxsids.hrc | 18 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 28 | ||||
-rw-r--r-- | sfx2/sdi/appslots.sdi | 23 | ||||
-rw-r--r-- | sfx2/sdi/docslots.sdi | 5 | ||||
-rw-r--r-- | sfx2/sdi/frmslots.sdi | 20 | ||||
-rw-r--r-- | sfx2/sdi/sfx.sdi | 232 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 7 |
8 files changed, 6 insertions, 329 deletions
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 110c6fa3aef0..1c21a4ad039e 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -480,7 +480,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix, if ( m == rBase.GetSlotList().size() ) { - OSL_FAIL("Invalid EnumSlot!"); + OSL_FAIL(OString("Invalid EnumSlot! " + aSId).getStr()); xEnumSlot = new SvMetaSlot( *this ); sal_uLong nValue; if ( rBase.FindId(aSId , &nValue) ) diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 81b113b58160..1d90b87e3d38 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -49,7 +49,6 @@ #define SID_PASTE_SPECIAL (SID_SFX_START + 311) #define SID_CLIPBOARD_FORMAT_ITEMS (SID_SFX_START + 312) -#define SID_VERSION_VISIBLE (SID_SFX_START + 313) #define SID_PASTE_UNFORMATTED (SID_SFX_START + 314) #define SID_PRINTER_NOTFOUND_WARN (SID_SFX_START + 320) #define SID_PRINTER_NAME (SID_SFX_START + 322) @@ -62,10 +61,8 @@ #define SID_MAIL_RECIPIENT (SID_SFX_START + 334) #define SID_MAIL_TEXT (SID_SFX_START + 335) -#define SID_MAIL_ATTACH (SID_SFX_START + 336) #define SID_MAIL_PRIORITY (SID_SFX_START + 337) -#define SID_MAIL_ATTACH_FILE (SID_SFX_START + 375) #define SID_MAIL_PREPAREEXPORT (SID_SFX_START + 385) #define SID_MAIL_EXPORT_FINISHED (SID_SFX_START + 388) @@ -79,7 +76,6 @@ // 360-400 see SID_MAIL_... // default-ids for help -#define SID_HELPONHELP (SID_SFX_START + 400) #define SID_HELPINDEX (SID_SFX_START + 401) #define SID_EXTENDEDHELP (SID_SFX_START + 402) #define SID_HELPBALLOONS (SID_SFX_START + 403) @@ -91,7 +87,6 @@ #define SID_DOCUMENTATION (SID_SFX_START + 423) #define SID_SHOW_LICENSE (SID_SFX_START + 1683) #define SID_SHOW_CREDITS (SID_SFX_START + 1711) -#define SID_HELP_TUTORIALS (SID_SFX_START + 1695) // default-ids for document #define SID_NEWDOC (SID_SFX_START + 500) @@ -112,8 +107,6 @@ #define SID_CLOSEDOC_SAVE (SID_SFX_START + 1) #define SID_CLOSEDOC_FILENAME (SID_SFX_START + 2) #define SID_PRINTDOC (SID_SFX_START + 504) -#define SID_PRINT_FIRST_PAGE (SID_SFX_START + 1) -#define SID_PRINT_LAST_PAGE (SID_SFX_START + 2) #define SID_PRINT_COPIES (SID_SFX_START + 3) #define SID_PRINT_PAGES (SID_SFX_START +1589) #define SID_PRINT_COLLATE (SID_SFX_START +1590) @@ -148,8 +141,6 @@ #define SID_BROWSE_FORWARD (SID_SFX_START + 1300) #define SID_BROWSE_BACKWARD (SID_SFX_START + 1301) #define SID_CREATELINK (SID_SFX_START + 1309) -#define SID_BOOKMARK_TITLE (SID_SFX_START + 1310) -#define SID_BOOKMARK_URL (SID_SFX_START + 1311) #define SID_EDITDOC (SID_SFX_START + 1312) #define SID_BROWSER_MODE (SID_SFX_START + 1313) // FREE (was SID_PLUGINS_ACTIVE) (SID_SFX_START + 1314) @@ -183,10 +174,8 @@ #define SID_OFFICE_CHECK_PLZ (SID_SFX_START + 1610) #define SID_CURRENT_URL (SID_SFX_START + 1613) -#define SID_TIPWINDOW (SID_SFX_START + 1632) #define SID_CHARSET (SID_SFX_START + 1633) #define SID_OVERWRITE (SID_SFX_START + 1634) -#define SID_PARTWIN (SID_SFX_START + 1640) // FREE (was: SID_CRASH) #define SID_FAIL_ON_WARNING (SID_SFX_START + 1646) #define SID_INPUTSTREAM (SID_SFX_START + 1648) @@ -202,14 +191,12 @@ #define SID_OUTPUTSTREAM (SID_SFX_START + 1666) #define SID_IMAGE_ORIENTATION (SID_SFX_START + 1667) -#define SID_SAVE_VERSION_ON_CLOSE (SID_SFX_START + 1670) #define SID_STOP_RECORDING (SID_SFX_START + 1671) #define SID_INTERACTIONHANDLER (SID_SFX_START + 1675) #define SID_OPENHYPERLINK (SID_SFX_START + 1676) #define SID_ADDONS (SID_SFX_START + 1678) #define SID_CONTENT (SID_SFX_START + 1679) #define SID_SHOW_IME_STATUS_WINDOW (SID_SFX_START + 1680) -#define SID_UPDATE_CONFIG (SID_SFX_START + 1681) #define SID_VIEWONLY (SID_SFX_START + 1682) #define SID_REPAIRPACKAGE (SID_SFX_START + 1683) #define SID_MINIMIZED (SID_SFX_START + 1687) @@ -400,8 +387,6 @@ #define SID_CURSORTOPOFSCREEN (SID_SFX_START + 744) #define SID_CURSORHOME (SID_SFX_START + 745) #define SID_CURSOREND (SID_SFX_START + 746) -#define SID_FORMATMENU (SID_SFX_START + 780) -#define SID_FORMATMENUSTATE (SID_SFX_START + 791) #define SID_UNICODE_NOTATION_TOGGLE (SID_SFX_START + 792) // default-ids for macros @@ -434,8 +419,6 @@ // Item-Id for the assigned event Tabpage #define SID_ATTR_MACROITEM (SID_SFX_START + 934) -#define SID_SAVECONFIG (SID_SFX_START + 930) -#define SID_LOADCONFIG (SID_SFX_START + 933) #define SID_OPTIONS (SID_SFX_START + 940) #define SID_BASICLOAD (SID_SFX_START + 951) #define SID_BASICSAVEAS (SID_SFX_START + 953) @@ -538,7 +521,6 @@ #define SID_ZOOM_IN (SID_SVX_START + 98) #define SID_SIZE_REAL (SID_SVX_START + 99) #define SID_SIZE_PAGE (SID_SVX_START + 100) -#define SID_SHOW_BROWSER (SID_SVX_START + 163) #define SID_GALLERY_BG_BRUSH (SID_SVX_START + 279) #define SID_SEARCH_OPTIONS (SID_SVX_START + 281) #define SID_SEARCH_ITEM (SID_SVX_START + 291) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 91f2ad247068..7f6b36f9246b 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1540,11 +1540,6 @@ <value>9</value> </prop> </node> - <node oor:name=".uno:HelpOnHelp" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Help on Help</value> - </prop> - </node> <node oor:name=".uno:Underline" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Underline</value> @@ -2881,14 +2876,6 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:ShowBrowser" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Display Properties</value> - </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> - </prop> - </node> <node oor:name=".uno:FillStyle" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Area Style / Filling</value> @@ -4929,21 +4916,11 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:SaveConfiguration" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Save configuration</value> - </prop> - </node> <node oor:name=".uno:TaskBarVisible" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value/> </prop> </node> - <node oor:name=".uno:LoadConfiguration" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Load Configuration</value> - </prop> - </node> <node oor:name=".uno:LoadBasic" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Insert BASIC Source</value> @@ -5402,11 +5379,6 @@ <value xml:lang="en-US">Current Date</value> </prop> </node> - <node oor:name=".uno:VersionVisible" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Version Visible</value> - </prop> - </node> <node oor:name=".uno:ShowItemBrowser" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Item Browser On/Off</value> diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index 6da19553c177..6ce38e1129a7 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -21,9 +21,6 @@ interface Application SID_AUTOPILOTMENU // ole(no) api(final/play/rec) [ ] - SID_FORMATMENU // ole(no) api(no) - [ - ] SID_HELPMENU // ole(no) api(no) [ ] @@ -53,10 +50,6 @@ interface Application [ ExecMethod = MiscExec_Impl ; ] - SID_HELPONHELP // ole(no) api(final/todo) - [ - ExecMethod = MiscExec_Impl ; - ] SID_EXTENDEDHELP // ole(no) api(final/play/norec) [ ExecMethod = MiscExec_Impl ; @@ -72,14 +65,6 @@ interface Application ExecMethod = MiscExec_Impl ; StateMethod = MiscState_Impl ; ] - SID_LOADCONFIG // ole(no) api(final/play) - [ - ExecMethod = MiscExec_Impl ; - ] - SID_SAVECONFIG // ole(no) api(final/play) - [ - ExecMethod = MiscExec_Impl ; - ] SID_CONFIG // ole(no) api(final/play/rec) [ ExecMethod = MiscExec_Impl ; @@ -135,10 +120,6 @@ interface Application ExecMethod = MiscExec_Impl ; StateMethod = MiscState_Impl ; ] - SID_UPDATE_CONFIG - [ - ExecMethod = MiscExec_Impl ; - ] SID_ADDONS [ ] @@ -220,10 +201,6 @@ interface Application ExecMethod = MiscExec_Impl ; StateMethod = MiscState_Impl ; ] - SID_HELP_TUTORIALS - [ - ExecMethod = MiscExec_Impl ; - ] SID_MENUBAR [ ExecMethod = MiscExec_Impl ; diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi index 18bd74133624..52476b5c16c6 100644 --- a/sfx2/sdi/docslots.sdi +++ b/sfx2/sdi/docslots.sdi @@ -234,11 +234,6 @@ shell SfxObjectShell ExecMethod = ExecFile_Impl ; StateMethod = GetState_Impl ; ] - SID_SAVE_VERSION_ON_CLOSE - [ - ExecMethod = ExecFile_Impl ; - StateMethod = GetState_Impl ; - ] SID_SIGNATURE [ ExecMethod = ExecFile_Impl; diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi index 3d41c1c72d6a..fb9465abb512 100644 --- a/sfx2/sdi/frmslots.sdi +++ b/sfx2/sdi/frmslots.sdi @@ -43,11 +43,6 @@ interface Window ExecMethod = ChildWindowExecute ; StateMethod = ChildWindowState ; ] - SID_SHOW_BROWSER // ole(no) api(final/play/rec) - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] SID_BROWSER // ole(no) api() [ ExecMethod = ChildWindowExecute ; @@ -58,16 +53,6 @@ interface Window ExecMethod = ChildWindowExecute ; StateMethod = ChildWindowState ; ] - SID_PARTWIN // ole(no) api() - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_TIPWINDOW - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] SID_SEARCH_DLG // ole(no) api(final/play/rec) [ ExecMethod = ChildWindowExecute ; @@ -305,11 +290,6 @@ shell SfxViewFrame { import TopWindow; - SID_FORMATMENUSTATE - [ - StateMethod = MiscState_Impl ; - ] - SID_ACTIVATE // ole(no) api(final/play/rec) [ ExecMethod = Exec_Impl ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 0619d990314e..dfedb685113c 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -213,7 +213,7 @@ SfxObjectItem NewDoc SID_NEWDOC SfxVoidItem AddBookmark SID_CREATELINK -(SfxStringItem URL SID_BOOKMARK_URL,SfxStringItem Title SID_BOOKMARK_TITLE) +() [ AutoUpdate = FALSE, FastCall = TRUE, @@ -1194,24 +1194,6 @@ SfxVoidItem FocusUrlBox SID_FOCUSURLBOX ] -SfxVoidItem FormatMenu SID_FORMATMENU -() -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_EDIT; -] - - SfxTemplateItem FrameStyle SID_STYLE_FAMILY3 [ @@ -1866,24 +1848,6 @@ SfxVoidItem HelpMenu SID_HELPMENU ] -SfxVoidItem HelpOnHelp SID_HELPONHELP -() -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_APPLICATION; -] - - SfxBoolItem HelpTip SID_HELPTIPS [ @@ -2043,7 +2007,7 @@ SfxBoolItem IsLoadingImages SID_IMG_LOADING SfxBoolItem IsPrinting SID_PRINTOUT [ - SfxVoidItem PrintOut(SfxInt16Item from SID_PRINT_FIRST_PAGE,SfxInt16Item to SID_PRINT_LAST_PAGE,SfxInt16Item copies SID_PRINT_COPIES,SfxBoolItem silent SID_SILENT); + SfxVoidItem PrintOut(SfxInt16Item copies SID_PRINT_COPIES,SfxBoolItem silent SID_SILENT); AutoUpdate = FALSE, FastCall = FALSE, @@ -2215,25 +2179,6 @@ SfxVoidItem LoadBasic SID_BASICLOAD ] -SfxVoidItem LoadConfiguration SID_LOADCONFIG -(SfxStringItem FileName SID_CFGFILE) -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = TRUE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_OPTIONS; -] - - SfxVoidItem LoadEvents SID_CONFIGEVENT (SfxStringItem FileName SID_CFGFILE) [ @@ -3070,25 +3015,6 @@ SfxTemplateItem ParaStyle SID_STYLE_FAMILY2 ] -SfxBoolItem PartWindow SID_PARTWIN - -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = TRUE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - - SfxVoidItem Paste SID_PASTE (SfxUInt16Item AnchorType FN_PARAM_1) [ @@ -3235,7 +3161,7 @@ SfxVoidItem PickList SID_PICKLIST SfxBoolItem Print SID_PRINTDOC -(SfxStringItem PrinterName SID_PRINTER_NAME,SfxStringItem FileName SID_FILE_NAME,SfxInt16Item From SID_PRINT_FIRST_PAGE,SfxInt16Item To SID_PRINT_LAST_PAGE,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) +(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, FastCall = FALSE, @@ -3785,25 +3711,6 @@ SfxVoidItem ImportDialog SID_IMPORT_DIALOG ] -SfxVoidItem SaveConfiguration SID_SAVECONFIG -(SfxStringItem FileName SID_CFGFILE) -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = TRUE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_OPTIONS; -] - - SfxBoolItem Saved SID_DOC_SAVED [ @@ -3988,7 +3895,7 @@ SfxVoidItem SendFax FN_FAX SfxBoolItem SendMail SID_MAIL_SENDDOC -(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE) +(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY ) [ AutoUpdate = FALSE, FastCall = FALSE, @@ -4008,7 +3915,7 @@ SfxBoolItem SendMail SID_MAIL_SENDDOC ] SfxBoolItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF -(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE) +(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY) [ AutoUpdate = FALSE, FastCall = FALSE, @@ -4128,25 +4035,6 @@ SfxVoidItem SetOptions SID_SETOPTIONS ] -SfxBoolItem ShowBrowser SID_SHOW_BROWSER - -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_CONTROLS; -] - - SfxBoolItem ShowPopups SID_SHOWPOPUPS [ @@ -4495,25 +4383,6 @@ SfxTemplateItem TableStyle SID_STYLE_FAMILY6 GroupId = GID_DOCUMENT; ] -SfxBoolItem TipsDialog SID_TIPWINDOW - -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = TRUE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_APPLICATION; -] - - SfxStringItem Title SID_DOCTITLE [ @@ -4757,26 +4626,6 @@ SfxUInt16Item MacroSignature SID_MACRO_SIGNATURE ] -SfxVoidItem VersionVisible SID_VERSION_VISIBLE -(SfxBoolItem Show SID_VERSION_VISIBLE) -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - SlotType = SfxBoolItem - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_VIEW; -] - - SfxBoolItem ViewDataSourceBrowser SID_VIEW_DATA_SOURCE_BROWSER [ @@ -4976,25 +4825,6 @@ SfxImageItem ImageOrientation SID_IMAGE_ORIENTATION ] -SfxBoolItem SaveVersionOnClose SID_SAVE_VERSION_ON_CLOSE - -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - - SfxVoidItem Addons SID_ADDONS [ AutoUpdate = FALSE, @@ -5030,24 +4860,6 @@ SfxBoolItem ShowImeStatusWindow SID_SHOW_IME_STATUS_WINDOW ] -SfxVoidItem UpdateConfiguration SID_UPDATE_CONFIG -(SfxStringItem StreamName SID_UPDATE_CONFIG ) -[ - AutoUpdate = FALSE, - FastCall = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = TRUE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_EXPLORER; -] - - SfxVoidItem SendFeedback SID_SEND_FEEDBACK () [ @@ -5131,40 +4943,6 @@ SfxVoidItem ShowCredits SID_SHOW_CREDITS ] -SfxVoidItem HelpTutorials SID_HELP_TUTORIALS -() -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_APPLICATION; -] - -SfxStringItem FormatMenuState SID_FORMATMENUSTATE -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - - SfxVoidItem InternetDialog SID_INET_DLG () [ diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index f7d3fe9bc749..fc9b4329c339 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2830,13 +2830,6 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) break; } - case SID_FORMATMENUSTATE : - { - OSL_FAIL("Outdated slot!"); - rSet.DisableItem( nWhich ); - break; - } - default: break; } |