diff options
author | Noel Grandin <noel@peralex.com> | 2014-12-23 09:47:48 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-08 10:39:36 +0200 |
commit | 45ec1d9b56cec41596f806ebf845ebfcd30c9f46 (patch) | |
tree | e368da6d3ae2c8a5c8e214b99dd0f95861d0fc78 /sd/inc | |
parent | 0748a5f8298e2ea817e131234f5e99300ed7f9f7 (diff) |
brute-force find-and-remove of unused #define constants.
Change-Id: I7223530ae37297a76654cd00cc1fedb56dbe3adb
Diffstat (limited to 'sd/inc')
-rw-r--r-- | sd/inc/glob.hrc | 3 | ||||
-rw-r--r-- | sd/inc/glob.hxx | 14 | ||||
-rw-r--r-- | sd/inc/helpids.h | 59 | ||||
-rw-r--r-- | sd/inc/sdattr.hrc | 1 | ||||
-rw-r--r-- | sd/inc/sdcommands.h | 19 |
5 files changed, 3 insertions, 93 deletions
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index bfcdc50567b8..3e12f4345472 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -114,9 +114,7 @@ #define STR_3DOBJECTBARSHELL RID_GLOB_START+104 #define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105 -#define STR_SIDEBARVIEWSHELL RID_GLOB_START+107 #define STR_MASTERPAGESSELECTOR RID_GLOB_START+108 -#define STR_SIDEBAR_LAYOUTMENU RID_GLOB_START+109 #define STR_PAGE_NAME RID_GLOB_START+111 #define STR_SLIDE_NAME RID_GLOB_START+112 @@ -137,7 +135,6 @@ #define DLG_TABLEDESIGNPANE RID_GLOB_START+224 -#define RID_TABPAGE_PARA_NUMBERING RID_GLOB_START+226 #define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227 #define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228 diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index e7da3a4a3c69..e229e9a2efd9 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -25,37 +25,23 @@ #define SD_IF_SDAPP SFX_INTERFACE_SD_START + 0 #define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + 1 -#define SD_IF_SDVIEWSHELL SFX_INTERFACE_SD_START + 2 #define SD_IF_SDDRAWVIEWSHELL SFX_INTERFACE_SD_START + 3 -#define SD_IF_SDSLIDEVIEWSHELL SFX_INTERFACE_SD_START + 4 #define SD_IF_SDOUTLINEVIEWSHELL SFX_INTERFACE_SD_START + 5 -#define SD_IF_SDDRAWSTDOBJECTBAR SFX_INTERFACE_SD_START + 6 #define SD_IF_SDDRAWTEXTOBJECTBAR SFX_INTERFACE_SD_START + 7 #define SD_IF_SDDRAWBEZIEROBJECTBAR SFX_INTERFACE_SD_START + 8 -#define SD_IF_SDDRAWGLUEPOINTSOBJECTBAR SFX_INTERFACE_SD_START + 9 #define SD_IF_SDGRAPHICDOCSHELL SFX_INTERFACE_SD_START + 10 #define SD_IF_SDGRAPHICVIEWSHELL SFX_INTERFACE_SD_START + 11 -#define SD_IF_SDGRAPHICSTDOBJECTBAR SFX_INTERFACE_SD_START + 12 #define SD_IF_SDDRAWGRAFOBJECTBAR SFX_INTERFACE_SD_START + 13 #define SD_IF_SDPRESVIEWSHELL SFX_INTERFACE_SD_START + 14 -#define SD_IF_SDPREVIEWVIEWSHELL SFX_INTERFACE_SD_START + 15 #define SD_IF_SDVIEWSHELLBASE SFX_INTERFACE_SD_START + 16 -#define SD_IF_SD3DOBJECTBAR SFX_INTERFACE_SD_START + 17 -#define SD_IF_SDFONTWORKOBJECTBAR SFX_INTERFACE_SD_START + 18 #define SD_IF_SDSLIDESORTERVIEWSHELL SFX_INTERFACE_SD_START + 19 -#define SD_IF_SDSIDEBARVIEWSHELL SFX_INTERFACE_SD_START + 20 -#define SD_IF_SDMASTERPAGESSELECTOR SFX_INTERFACE_SD_START + 21 -#define SD_IF_SDLAYOUTMENU SFX_INTERFACE_SD_START + 22 #define SD_IF_SDDRAWMEDIAOBJECTBAR SFX_INTERFACE_SD_START + 23 #define SD_IF_SDLEFTIMPRESSPANESHELL SFX_INTERFACE_SD_START + 24 #define SD_IF_SDLEFTDRAWPANESHELL SFX_INTERFACE_SD_START + 25 -#define SD_IF_SDRIGHTPANESHELL SFX_INTERFACE_SD_START + 26 #define SD_IF_SDDRAWTABLEOBJECTBAR SFX_INTERFACE_SD_START + 27 -#define SD_IF_SDANNOTATIONSHELL SFX_INTERFACE_SD_START + 28 #define SD_IF_SDTOOLPANELPANESHELL SFX_INTERFACE_SD_START + 29 #define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30 -#define SD_IF_SDTASKPANEVIEWSHELL SFX_INTERFACE_SD_START + 31 // Inventor-Id for StarDraw UserData const sal_uInt32 SdUDInventor=sal_uInt32('S')*0x00000001+ diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index 51421d02de4c..c24b66273d74 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -23,26 +23,9 @@ #define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL" #define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL" #define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL" -#define HID_SD_OPTIONS_SNAP "SD_HID_SD_OPTIONS_SNAP" -#define HID_SD_CBX_ONLYSELECTED "SD_HID_SD_CBX_ONLYSELECTED" -#define HID_SD_BTN_FILTERDIALOG "SD_HID_SD_BTN_FILTERDIALOG" -#define HID_SD_BTN_PAGE "SD_HID_SD_BTN_PAGE" -#define HID_SD_BTN_MASTERPAGE "SD_HID_SD_BTN_MASTERPAGE" -#define HID_SD_BTN_LAYER "SD_HID_SD_BTN_LAYER" -#define HID_SD_BTN_DRAW "SD_HID_SD_BTN_DRAW" -#define HID_SD_BTN_SLIDE "SD_HID_SD_BTN_SLIDE" -#define HID_SD_BTN_OUTLINE "SD_HID_SD_BTN_OUTLINE" -#define HID_SD_BTN_NOTES "SD_HID_SD_BTN_NOTES" -#define HID_SD_BTN_HANDOUT "SD_HID_SD_BTN_HANDOUT" #define HID_SD_WIN_DOCUMENT "SD_HID_SD_WIN_DOCUMENT" -#define HID_SD_OPTIONS_LAYOUT "SD_HID_SD_OPTIONS_LAYOUT" -#define HID_SD_EFFECT_PREVIEW "SD_HID_SD_EFFECT_PREVIEW" -#define HID_SD_CTL_NEWFOIL "SD_HID_SD_CTL_NEWFOIL" #define HID_SD_NAVIGATOR_TLB "SD_HID_SD_NAVIGATOR_TLB" #define HID_SD_NAVIGATOR "SD_HID_SD_NAVIGATOR" -#define HID_SD_CTL_EFFECTS "SD_HID_SD_CTL_EFFECTS" -#define HID_SD_CTL_TEXT_EFFECTS "SD_HID_SD_CTL_TEXT_EFFECTS" -#define HID_SD_CTL_SLIDE_CHANGE "SD_HID_SD_CTL_SLIDE_CHANGE" #define HID_SD_NAVIGATOR_TBX "SD_HID_SD_NAVIGATOR_TBX" #define HID_SD_NAVIGATOR_LB "SD_HID_SD_NAVIGATOR_LB" #define HID_SD_NAVIGATOR_TBI_PEN "SD_HID_SD_NAVIGATOR_TBI_PEN" @@ -65,7 +48,6 @@ #define HID_SD_WIN_PRESENTATION "SD_HID_SD_WIN_PRESENTATION" -#define HID_SD_BTN_PRESENTATION "SD_HID_SD_BTN_PRESENTATION" #define HID_SD_HTMLEXPORT_PAGE1 "SD_HID_SD_HTMLEXPORT_PAGE1" #define HID_SD_HTMLEXPORT_PAGE2 "SD_HID_SD_HTMLEXPORT_PAGE2" @@ -74,51 +56,19 @@ #define HID_SD_HTMLEXPORT_PAGE5 "SD_HID_SD_HTMLEXPORT_PAGE5" #define HID_SD_HTMLEXPORT_PAGE6 "SD_HID_SD_HTMLEXPORT_PAGE6" -#define HID_SD_CHGFOIL_LAYOUT "SD_HID_SD_CHGFOIL_LAYOUT" -#define HID_SD_CHGFOIL_BACKGROUND "SD_HID_SD_CHGFOIL_BACKGROUND" -#define HID_SD_CHGFOIL_OBJECTS "SD_HID_SD_CHGFOIL_OBJECTS" -#define HID_SD_CHGFOIL_NAME "SD_HID_SD_CHGFOIL_NAME" -#define HID_FM_CTL_SELECTION "SD_HID_FM_CTL_SELECTION" #define HID_SD_TABBAR_PAGES "SD_HID_SD_TABBAR_PAGES" #define HID_SD_TABBAR_LAYERS "SD_HID_SD_TABBAR_LAYERS" -#define HID_SD_UNDODELETEWARNING_DLG "SD_HID_SD_UNDODELETEWARNING_DLG" -#define HID_SD_UNDODELETEWARNING_CBX "SD_HID_SD_UNDODELETEWARNING_CBX" #define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT" #define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE" #define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND" -#define HID_SD_TASK_PANE "SD_HID_SD_TASK_PANE" -#define HID_SD_SLIDE_DESIGNS "SD_HID_SD_SLIDE_DESIGNS" -#define HID_SD_CURRENT_MASTERS "SD_HID_SD_CURRENT_MASTERS" -#define HID_SD_RECENT_MASTERS "SD_HID_SD_RECENT_MASTERS" -#define HID_SD_ALL_MASTERS "SD_HID_SD_ALL_MASTERS" -#define HID_SD_SLIDE_LAYOUTS "SD_HID_SD_SLIDE_LAYOUTS" -#define HID_SD_CUSTOM_ANIMATIONS "SD_HID_SD_CUSTOM_ANIMATIONS" -#define HID_SD_SLIDE_TRANSITIONS "SD_HID_SD_SLIDE_TRANSITIONS" - -#define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES "SD_HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES" -#define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL" -#define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY" -#define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW" -#define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW "SD_HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW" - -#define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS "SD_HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS" -#define HID_SD_SLIDETRANSITIONPANE_LB_SPEED "SD_HID_SD_SLIDETRANSITIONPANE_LB_SPEED" -#define HID_SD_SLIDETRANSITIONPANE_LB_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_LB_SOUND" -#define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND" -#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE" -#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO" -#define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER "SD_HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER" -#define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL "SD_HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL" -#define HID_SD_SLIDETRANSITIONPANE_PB_PLAY "SD_HID_SD_SLIDETRANSITIONPANE_PB_PLAY" -#define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW "SD_HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW" -#define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW "SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW" - -#define HID_SD_TASK_PANE_VIEW_MENU "SD_HID_SD_TASK_PANE_VIEW_MENU" + + + #define HID_SD_TASK_PANE_PREVIEW_CURRENT "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT" #define HID_SD_TASK_PANE_PREVIEW_RECENT "SD_HID_SD_TASK_PANE_PREVIEW_RECENT" #define HID_SD_TASK_PANE_PREVIEW_ALL "SD_HID_SD_TASK_PANE_PREVIEW_ALL" @@ -133,13 +83,10 @@ #define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX" #define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX" -#define HID_SD_SLIDESHOW_DISPLAY "SD_HID_SD_SLIDESHOW_DISPLAY" #define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL" #define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL" -#define HID_SD_TABLE_DESIGN "SD_HID_SD_TABLE_DESIGN" -#define HID_SD_ANNOTATIONS "SD_HID_SD_ANNOTATIONS" #define HID_MN_SUB_GRAPHIC "SD_HID_MN_SUB_GRAPHIC" #define HID_MN_SUB_FIELD "SD_HID_MN_SUB_FIELD" diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index 94dc73ec9414..8ba4028bf50e 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -61,7 +61,6 @@ #define ATTR_PRESENT_CHANGE_PAGE ATTR_PRESENT_START + 8 #define ATTR_PRESENT_ALWAYS_ON_TOP ATTR_PRESENT_START + 9 #define ATTR_PRESENT_FULLSCREEN ATTR_PRESENT_START + 10 -#define ATTR_PRESENT_START_ACTUAL_PAGE ATTR_PRESENT_START + 11 #define ATTR_PRESENT_ANIMATION_ALLOWED ATTR_PRESENT_START + 12 #define ATTR_PRESENT_PAUSE_TIMEOUT ATTR_PRESENT_START + 13 #define ATTR_PRESENT_SHOW_PAUSELOGO ATTR_PRESENT_START + 14 diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h index 276bf6dd62c6..2f4bf56121ef 100644 --- a/sd/inc/sdcommands.h +++ b/sd/inc/sdcommands.h @@ -21,7 +21,6 @@ #define CMD_SID_OBJECT_MIRROR ".uno:Mirror" #define CMD_SID_ANIMATION_EFFECTS ".uno:AnimationEffects" -#define CMD_SID_ANIMATION_OBJECTS ".uno:AnimationObjects" #define CMD_SID_MOREBACK ".uno:Backward" #define CMD_SID_BEFORE_OBJ ".uno:BeforeObject" #define CMD_SID_BEHIND_OBJ ".uno:BehindObject" @@ -38,21 +37,10 @@ #define CMD_SID_CONVERT_TO_3D_LATHE_FAST ".uno:ConvertInto3DLatheFast" #define CMD_SID_CONVERT_TO_BITMAP ".uno:ConvertIntoBitmap" #define CMD_SID_CONVERT_TO_METAFILE ".uno:ConvertIntoMetaFile" -#define CMD_SID_CONVERT_TO_1BIT_MATRIX ".uno:ConvertTo1BitMatrix" -#define CMD_SID_CONVERT_TO_1BIT_THRESHOLD ".uno:ConvertTo1BitThreshold" -#define CMD_SID_CONVERT_TO_4BIT_COLORS ".uno:ConvertTo4BitColors" -#define CMD_SID_CONVERT_TO_4BIT_GRAYS ".uno:ConvertTo4BitGrays" -#define CMD_SID_CONVERT_TO_8BIT_COLORS ".uno:ConvertTo8BitColors" -#define CMD_SID_CONVERT_TO_8BIT_GRAYS ".uno:ConvertTo8BitGrays" -#define CMD_SID_CONVERT_TO_24BIT ".uno:ConvertToTrueColor" -#define CMD_SID_COPYOBJECTS ".uno:CopyObjects" -#define CMD_SID_CUSTOMSHOW_DLG ".uno:CustomShowDialog" #define CMD_SID_DELETE_LAYER ".uno:DeleteLayer" #define CMD_SID_DELETE_PAGE ".uno:DeletePage" #define CMD_SID_DELETE_SNAPITEM ".uno:DeleteSnapItem" -#define CMD_SID_DIAMODE ".uno:DiaMode" #define CMD_SID_DISMANTLE ".uno:Dismantle" -#define CMD_SID_DRAWINGMODE ".uno:DrawingMode" #define CMD_SID_CUSTOM_ANIMATION_PANEL ".uno:CustomAnimation" #define CMD_SID_MOREFRONT ".uno:Forward" #define CMD_SID_GLUE_ESCDIR_BOTTOM ".uno:GlueEscapeDirectionBottom" @@ -83,19 +71,14 @@ #define CMD_SID_MODIFYLAYER ".uno:ModifyLayer" #define CMD_SID_MODIFYPAGE ".uno:ModifyPage" #define CMD_SID_PRESENTATIONOBJECT ".uno:ModifyPresentationObject" -#define CMD_SID_POLYGON_MORPHING ".uno:Morphing" #define CMD_SID_NAME_GROUP ".uno:NameGroup" #define CMD_SID_OBJECT_TITLE_DESCRIPTION ".uno:ObjectTitleDescription" #define CMD_SID_CONNECTION_NEW_ROUTING ".uno:NewRouting" #define CMD_SID_NOTESMODE ".uno:NotesMode" #define CMD_SID_POSITION ".uno:ObjectPosition" #define CMD_SID_ORIGINAL_SIZE ".uno:OriginalSize" -#define CMD_SID_OUTLINEMODE ".uno:OutlineMode" #define CMD_SID_OUTLINE_TEXT_AUTOFIT ".uno.OutlineTextAutofit" #define CMD_SID_PAGESETUP ".uno:PageSetup" -#define CMD_SID_PRESENTATION ".uno:Presentation" -#define CMD_SID_PRESENTATION_CURRENT_SLIDE ".uno:PresentationCurrentSlide" -#define CMD_SID_REMOTE_DLG ".uno:Remote" #define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout" #define CMD_SID_RENAMELAYER ".uno:RenameLayer" #define CMD_SID_RENAMEPAGE ".uno:RenamePage" @@ -117,8 +100,6 @@ #define CMD_SID_TP_SHOW_LARGE_PREVIEW ".uno:TaskPaneShowLargePreview" #define CMD_SID_TP_EDIT_MASTER ".uno:TaskPaneEditMaster" #define CMD_SID_INSERTPAGE_LAYOUT_MENU ".uno:TaskPaneInsertPage" -#define CMD_SID_PHOTOALBUM ".uno:PhotoAlbumDialog" -#define CMD_SID_PRESENTATION_MINIMIZER ".uno:PresentationMinimizer" #define CMD_SID_HIDE_LAST_LEVEL ".uno:HideLastLevel" #define CMD_SID_SHOW_NEXT_LEVEL ".uno:ShowNextLevel" |