diff options
-rw-r--r-- | basctl/sdi/baside.sdi | 6 | ||||
-rw-r--r-- | include/svx/svxids.hrc | 15 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 47 | ||||
-rw-r--r-- | sd/inc/app.hrc | 1 | ||||
-rw-r--r-- | sd/sdi/_drvwsh.sdi | 5 | ||||
-rw-r--r-- | svx/sdi/svx.sdi | 186 |
6 files changed, 2 insertions, 258 deletions
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi index f4993919e5ae..6433eccfc53a 100644 --- a/basctl/sdi/baside.sdi +++ b/basctl/sdi/baside.sdi @@ -282,12 +282,6 @@ shell basctl_Shell StateMethod = GetState; ] - SID_BASICIDE_NEWJAVAMODULE - [ - ExecMethod = ExecuteGlobal; - StateMethod = GetState; - ] - SID_BASICIDE_NEWDIALOG [ ExecMethod = ExecuteGlobal; diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 2ba5f668067d..e042d4e156bf 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -80,7 +80,6 @@ #define SID_POLY_MERGE (SID_SFX_START + 679) #define SID_POLY_SUBSTRACT (SID_SFX_START + 680) #define SID_POLY_INTERSECT (SID_SFX_START + 681) -#define SID_POLY_FORMEN (SID_SFX_START + 682) #define SID_DISTRIBUTE_DLG (SID_SFX_START + 683) #define SID_EQUALIZEWIDTH (SID_SFX_START + 684) #define SID_EQUALIZEHEIGHT (SID_SFX_START + 685) @@ -125,7 +124,6 @@ #define SID_BASICIDE_STAT_POS ( SID_BASICIDE_START + 38 ) #define SID_BASICIDE_STAT_DATE ( SID_BASICIDE_START + 39 ) #define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 ) -#define SID_BASICIDE_NEWJAVAMODULE ( SID_BASICIDE_START + 41 ) #define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) // StarBase-Id's @@ -145,7 +143,6 @@ #define SID_ENTER_GROUP (SID_SD_START+96) #define SID_LEAVE_GROUP (SID_SD_START+97) #define SID_SIZE_PAGE_WIDTH (SID_SD_START+98) -#define SID_INSERT_IMAGE (SID_SD_START+105) #define SID_INSERT_MATH (SID_SD_START+106) #define SID_SIZE_VISAREA (SID_SD_START+114) #define SID_ATTR_SYMBOLTYPE (SID_SD_START+115) //wird vom Chart und von SvxLineTabPage genutzt @@ -284,7 +281,6 @@ #define SID_BEZIER_MOVE ( SID_SVX_START + 121 ) #define SID_BEZIER_CLOSE ( SID_SVX_START + 122 ) #define SID_BEZIER_SMOOTH ( SID_SVX_START + 123 ) -#define SID_BEZIER_APPEND ( SID_SVX_START + 124 ) #define SID_BEZIER_EDIT ( SID_SVX_START + 126 ) #define SID_BEZIER_CUTLINE ( SID_SVX_START + 127 ) #define SID_OBJECT_SELECT ( SID_SVX_START + 128 ) @@ -351,8 +347,6 @@ #define SID_INSERT_SPINBUTTON ( SID_SVX_START + 194 ) #define SID_INSERT_HSCROLLBAR ( SID_SVX_START + 195 ) #define SID_INSERT_VSCROLLBAR ( SID_SVX_START + 196 ) -#define SID_INSERT_PREVIEW ( SID_SVX_START + 197 ) -#define SID_INSERT_URLBUTTON ( SID_SVX_START + 198 ) #define SID_INSERT_SELECT ( SID_SVX_START + 199 ) #define SID_DIALOG_TESTMODE ( SID_SVX_START + 200 ) #define SID_FRAME_LINESTYLE ( SID_SVX_START + 201 ) @@ -487,12 +481,11 @@ #define SID_DRAWTBX_LINES ( SID_SVX_START + 401 ) #define SID_BACKGRND_DESTINATION ( SID_SVX_START + 404 ) #define SID_ATTR_FLASH ( SID_SVX_START + 406 ) -#define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* Slots mit --> koennen demnaechst entfallen */ -#define SID_ATTR_3D_START SID_ATTR_3D_LIGHT // CAUTION! Range <413 .. 413> used by EditEngine (!) -#define SID_RULER_PROTECT ( SID_SVX_START + 415 ) +#define SID_ATTR_3D_START ( SID_SVX_START + 415 ) +#define SID_RULER_PROTECT SID_ATTR_3D_START #define SID_COLOR_CONTROL ( SID_SVX_START + 417 ) #define SID_TABLE_INSERT_COL_BEFORE ( SID_SVX_START + 418 ) @@ -514,7 +507,6 @@ #define SID_SC_EDITOPTIONS ( SID_SVX_START + 435 ) #define SID_SM_EDITOPTIONS ( SID_SVX_START + 436 ) #define SID_SCH_EDITOPTIONS ( SID_SVX_START + 437 ) -#define SID_SIM_EDITOPTIONS ( SID_SVX_START + 438 ) #define SID_SW_ONLINEOPTIONS ( SID_SVX_START + 439 ) #define SID_GET_COLORLIST ( SID_SVX_START + 441 ) #define SID_OUTLINE_TO_IMPRESS ( SID_SVX_START + 443 ) @@ -632,7 +624,6 @@ #define SID_FM_ORDERCRIT ( SID_SVX_START + 714 ) #define SID_FM_FILTERCRIT ( SID_SVX_START + 715 ) #define SID_FM_AUTOFILTER ( SID_SVX_START + 716 ) -#define SID_FM_COUNTALL ( SID_SVX_START + 717 ) #define SID_FM_NATIVESQL ( SID_SVX_START + 720 ) #define SID_FM_EXECUTE ( SID_SVX_START + 721 ) #define SID_SBA_QRY_EXECUTE SID_FM_EXECUTE @@ -675,7 +666,6 @@ #define SID_FM_FILTER_IS_NULL ( SID_SVX_START + 759 ) #define SID_FM_FILTER_IS_NOT_NULL ( SID_SVX_START + 760 ) #define SID_FM_VIEW_AS_GRID ( SID_SVX_START + 761 ) -#define SID_FM_FILTER_REMOVE ( SID_SVX_START + 762 ) #define SID_FM_AUTOCONTROLFOCUS ( SID_SVX_START + 763 ) #define SID_DSBROWSER_EXPLORER ( SID_SVX_START + 764 ) #define SID_FM_CREATE_FIELDCONTROL ( SID_SVX_START + 765 ) @@ -883,7 +873,6 @@ #define SID_INSERT_TREECONTROL ( SID_SVX_START + 1063 ) #define SID_ATTR_VIEWLAYOUT ( SID_SVX_START + 1064 ) #define SID_ATTR_ZOOMSLIDER ( SID_SVX_START + 1065 ) -#define SID_FONTNAMELIST ( SID_SVX_START + 1066 ) #define SID_LANGUAGE_STATUS ( SID_SVX_START + 1067 ) #define SID_CHAR_DLG_FOR_PARAGRAPH ( SID_SVX_START + 1068 ) #define SID_SET_DOCUMENT_LANGUAGE ( SID_SVX_START + 1069 ) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 411e858ed39e..91f2ad247068 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -3186,11 +3186,6 @@ <value xml:lang="en-US">Smart Tags</value> </prop> </node> - <node oor:name=".uno:InsertImage" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Insert from Image Editor</value> - </prop> - </node> <node oor:name=".uno:SetBorderStyle" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Borders (Shift to overwrite)</value> @@ -3291,22 +3286,6 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:Preview" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Preview</value> - </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> - </prop> - </node> - <node oor:name=".uno:URLButton" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">URL Button</value> - </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> - </prop> - </node> <node oor:name=".uno:ModifiedStatus" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Document Modified</value> @@ -4554,11 +4533,6 @@ <value xml:lang="en-US">Chart Options</value> </prop> </node> - <node oor:name=".uno:SimEditOptions" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Image Options</value> - </prop> - </node> <node oor:name=".uno:FrameName" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Name</value> @@ -5580,14 +5554,6 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:CountAll" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Records</value> - </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> - </prop> - </node> <node oor:name=".uno:SbaNativeSql" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Run SQL command directly</value> @@ -5782,14 +5748,6 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:RemoveFilter" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Reset Filter</value> - </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> - </prop> - </node> <node oor:name=".uno:AutoControlFocus" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Automatic Control Focus</value> @@ -6093,11 +6051,6 @@ <value xml:lang="en-US">Alig~n</value> </prop> </node> - <node oor:name=".uno:PolyFormen" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">~Shapes</value> - </prop> - </node> <node oor:name=".uno:Scan" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Scan</value> diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 0897e6c38fbe..79d5e8ed649c 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -154,7 +154,6 @@ #define SID_OBJECT_TRANSPARENCE (SID_SD_START+100) #define SID_OBJECT_GRADIENT (SID_SD_START+101) // FREE -// In svxids.hrc: SID_INSERT_IMAGE (SID_SD_START+105) // In svxids.hrc: SID_INSERT_MATH (SID_SD_START+106) #define SID_OBJECT_SHEAR (SID_SD_START+107) #define SID_DELETE_SNAPITEM (SID_SD_START+108) diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index e2206f7ca94a..2ff002ff7fae 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -402,11 +402,6 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] - SID_INSERT_IMAGE // ole : yes, status : ? - [ - ExecMethod = FuTemporary ; - StateMethod = GetMenuState ; - ] SID_INSERT_MATH // ole : yes, status : ? [ ExecMethod = FuTemporary ; diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index de667767436b..083be9c7ae50 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -488,25 +488,6 @@ SfxBoolItem Bezier_Unfilled SID_DRAW_BEZIER_NOFILL ] -SfxBoolItem BezierAppend SID_BEZIER_APPEND - -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_DRAWING; -] - - SfxStringItem BezierClose SID_BEZIER_CLOSE [ @@ -2152,24 +2133,6 @@ SfxBoolItem ConvertToNavigationBar SID_FM_CONVERTTO_NAVIGATIONBAR ] -SfxVoidItem CountAll SID_FM_COUNTALL -() -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_TABLE; -] - - SfxBoolItem CreateControl SID_FM_CREATE_CONTROL () [ @@ -4710,25 +4673,6 @@ SfxBoolItem InsertGraphic SID_INSERT_GRAPHIC ] -SfxVoidItem InsertImage SID_INSERT_IMAGE -() -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_INSERT; -] - - SfxVoidItem InsertMath SID_INSERT_MATH () [ @@ -5675,24 +5619,6 @@ SfxVoidItem Merge SID_POLY_MERGE ] -SfxVoidItem NewJavaModule SID_BASICIDE_NEWJAVAMODULE -() -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_MACRO; -] - SfxBoolItem NewRecord SID_FM_RECORD_NEW () @@ -6386,25 +6312,6 @@ SfxVoidItem Pie_Unfilled SID_DRAW_PIE_NOFILL ] -SfxVoidItem PolyFormen SID_POLY_FORMEN -() -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_MODIFY; -] - - SfxBoolItem Polygon_Diagonal SID_DRAW_XPOLYGON [ @@ -6478,25 +6385,6 @@ SfxPointItem Position SID_ATTR_POSITION ] -SfxBoolItem Preview SID_INSERT_PREVIEW - -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerItem; - - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_CONTROLS; -] - - SfxBoolItem PrevRecord SID_FM_RECORD_PREV () [ @@ -7017,24 +6905,6 @@ SfxVoidItem RefreshFormControl SID_FM_REFRESH_FORM_CONTROL ] -SfxVoidItem RemoveFilter SID_FM_FILTER_REMOVE -() -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_TABLE; -] - - SfxVoidItem RemoveFilterSort SID_FM_REMOVE_FILTER_SORT () [ @@ -7819,24 +7689,6 @@ SfxBoolItem ShowRuler SID_RULER ] -SfxVoidItem SimEditOptions SID_SIM_EDITOPTIONS -() -[ - AutoUpdate = FALSE, - FastCall = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = TRUE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_OPTIONS; -] - - SvxSizeItem Size SID_ATTR_SIZE [ @@ -8685,25 +8537,6 @@ SvxTextLineItem Overline SID_ATTR_CHAR_OVERLINE ] -SfxBoolItem URLButton SID_INSERT_URLBUTTON - -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerItem; - - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_CONTROLS; -] - - SfxBoolItem UseWizards SID_FM_USE_WIZARDS [ @@ -11306,25 +11139,6 @@ SvxZoomSliderItem ZoomSlider SID_ATTR_ZOOMSLIDER ] - SfxStringListItem FontNameStringList SID_FONTNAMELIST - [ - // flags: - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - // config: - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_DOCUMENT; -] - - SfxVoidItem LanguageStatus SID_LANGUAGE_STATUS (SfxStringItem Language SID_LANGUAGE_STATUS) [ |