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 | |
parent | 0748a5f8298e2ea817e131234f5e99300ed7f9f7 (diff) |
brute-force find-and-remove of unused #define constants.
Change-Id: I7223530ae37297a76654cd00cc1fedb56dbe3adb
Diffstat (limited to 'sd')
-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 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptdef.hxx | 106 | ||||
-rw-r--r-- | sd/source/filter/html/htmlex.hxx | 3 | ||||
-rw-r--r-- | sd/source/filter/ppt/propread.hxx | 15 | ||||
-rw-r--r-- | sd/source/ui/inc/optsitem.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/inc/unoprnms.hxx | 16 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h | 271 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h | 28 | ||||
-rwxr-xr-x | sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h | 3 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h | 1 | ||||
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.hrc | 1 |
15 files changed, 3 insertions, 538 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" diff --git a/sd/source/filter/eppt/epptdef.hxx b/sd/source/filter/eppt/epptdef.hxx index e4f88bb18a2b..4bad4320561d 100644 --- a/sd/source/filter/eppt/epptdef.hxx +++ b/sd/source/filter/eppt/epptdef.hxx @@ -20,52 +20,25 @@ #ifndef INCLUDED_SD_SOURCE_FILTER_EPPT_EPPTDEF_HXX #define INCLUDED_SD_SOURCE_FILTER_EPPT_EPPTDEF_HXX -#define EPP_FLAG_CONTAINER 0x0F // If the version field of a record - // header takes on this value, the - // record header marks the start of - // a container. - -#define EPP_Unknown 0 -#define EPP_SubContainerCompleted 1 -#define EPP_IRRAtom 2 -#define EPP_PSS 3 -#define EPP_SubContainerException 4 -#define EPP_ClientSignal1 6 -#define EPP_ClientSignal2 7 -#define EPP_PowerPointStateInfoAtom 10 #define EPP_Document 1000 #define EPP_DocumentAtom 1001 #define EPP_EndDocument 1002 -#define EPP_SlidePersist 1003 -#define EPP_SlideBase 1004 -#define EPP_SlideBaseAtom 1005 #define EPP_Slide 1006 #define EPP_SlideAtom 1007 #define EPP_Notes 1008 #define EPP_NotesAtom 1009 #define EPP_Environment 1010 #define EPP_SlidePersistAtom 1011 //0x03F3 -#define EPP_Scheme 1012 -#define EPP_SchemeAtom 1013 -#define EPP_DocViewInfo 1014 -#define EPP_SslideLayoutAtom 1015 #define EPP_MainMaster 1016 #define EPP_SSSlideInfoAtom 1017 #define EPP_SlideViewInfo 1018 #define EPP_GuideAtom 1019 -#define EPP_ViewInfo 1020 #define EPP_ViewInfoAtom 1021 #define EPP_SlideViewInfoAtom 1022 #define EPP_VBAInfo 1023 #define EPP_VBAInfoAtom 1024 #define EPP_SSDocInfoAtom 1025 -#define EPP_Summary 1026 -#define EPP_Texture 1027 -#define EPP_VBASlideInfo 1028 -#define EPP_VBASlideInfoAtom 1029 -#define EPP_DocRoutingSlip 1030 #define EPP_OutlineViewInfo 1031 -#define EPP_SorterViewInfo 1032 #define EPP_ExObjList 1033 #define EPP_ExObjListAtom 1034 #define EPP_PPDrawingGroup 1035 @@ -75,47 +48,26 @@ #define EPP_NamedShowSlides 1042 #define EPP_List 2000 #define EPP_FontCollection 2005 -#define EPP_ListPlaceholder 2017 -#define EPP_BookmarkCollection 2019 #define EPP_SoundCollection 2020 #define EPP_SoundCollAtom 2021 #define EPP_Sound 2022 #define EPP_SoundData 2023 -#define EPP_BookmarkSeedAtom 2025 -#define EPP_GuideList 2026 -#define EPP_RunArray 2028 -#define EPP_RunArrayAtom 2029 -#define EPP_ArrayElementAtom 2030 -#define EPP_Int4ArrayAtom 2031 #define EPP_ColorSchemeAtom 2032 // these atoms first was seen in ppt2000 in a private Tag atom #define EPP_PST_ExtendedBuGraContainer 2040 // consist of 4041 -#define EPP_PST_ExtendedBuGraAtom 2041 // the instance of this atom indices the current graphic -#define EPP_OEShape 3008 #define EPP_ExObjRefAtom 3009 #define EPP_OEPlaceholderAtom 3011 -#define EPP_GrColor 3020 -#define EPP_GrectAtom 3025 -#define EPP_GratioAtom 3031 -#define EPP_Gscaling 3032 -#define EPP_GpointAtom 3034 -#define EPP_OEShapeAtom 3035 -#define EPP_OutlineTextRefAtom 3998 #define EPP_TextHeaderAtom 3999 #define EPP_TextCharsAtom 4000 #define EPP_StyleTextPropAtom 4001 #define EPP_BaseTextPropAtom 4002 #define EPP_TxMasterStyleAtom 4003 #define EPP_TxCFStyleAtom 4004 -#define EPP_TxPFStyleAtom 4005 #define EPP_TextRulerAtom 4006 -#define EPP_TextBookmarkAtom 4007 -#define EPP_TextBytesAtom 4008 #define EPP_TxSIStyleAtom 4009 #define EPP_TextSpecInfoAtom 4010 -#define EPP_DefaultRulerAtom 4011 // these atoms first was seen in ppt2000 in a private Tag atom #define EPP_PST_ExtendedParagraphAtom 4012 @@ -125,52 +77,24 @@ // the first sal_uInt32 in this atom indices the current slideId #define EPP_FontEnityAtom 4023 -#define EPP_FontEmbedData 4024 -#define EPP_TypeFace 4025 #define EPP_CString 4026 -#define EPP_ExternalObject 4027 -#define EPP_MetaFile 4033 -#define EPP_ExOleObj 4034 #define EPP_ExOleObjAtom 4035 -#define EPP_ExPlainLinkAtom 4036 -#define EPP_CorePict 4037 -#define EPP_CorePictAtom 4038 -#define EPP_ExPlainAtom 4039 #define EPP_SrKinsoku 4040 -#define EPP_Handout 4041 #define EPP_ExEmbed 4044 #define EPP_ExEmbedAtom 4045 -#define EPP_ExLink 4046 -#define EPP_ExLinkAtom_old 4047 -#define EPP_BookmarkEntityAtom 4048 -#define EPP_ExLinkAtom 4049 #define EPP_SrKinsokuAtom 4050 #define EPP_ExHyperlinkAtom 4051 -#define EPP_ExPlain 4053 -#define EPP_ExPlainLink 4054 #define EPP_ExHyperlink 4055 #define EPP_SlideNumberMCAtom 4056 #define EPP_HeadersFooters 4057 #define EPP_HeadersFootersAtom 4058 -#define EPP_RecolorEntryAtom 4062 #define EPP_TxInteractiveInfoAtom 4063 -#define EPP_EmFormatAtom 4065 -#define EPP_CharFormatAtom 4066 -#define EPP_ParaFormatAtom 4067 -#define EPP_MasterText 4068 -#define EPP_RecolorInfoAtom 4071 -#define EPP_ExQuickTime 4073 -#define EPP_ExQuickTimeMovie 4074 -#define EPP_ExQuickTimeMovieData 4075 -#define EPP_ExSubscription 4076 -#define EPP_ExSubscriptionSection 4077 #define EPP_ExControl 4078 #define EPP_ExControlAtom 4091 #define EPP_SlideListWithText 4080 // 0x0FF0 #define EPP_AnimationInfoAtom 4081 #define EPP_InteractiveInfo 4082 #define EPP_InteractiveInfoAtom 4083 -#define EPP_SlideList 4084 #define EPP_UserEditAtom 4085 #define EPP_CurrentUserAtom 4086 #define EPP_DateTimeMCAtom 4087 @@ -179,35 +103,19 @@ #define EPP_FooterMCAtom 4090 #define EPP_ExMediaAtom 4100 #define EPP_ExVideo 4101 -#define EPP_ExAviMovie 4102 #define EPP_ExMCIMovie 4103 -#define EPP_ExMIDIAudio 4109 -#define EPP_ExCDAudio 4110 -#define EPP_ExWAVAudioEmbedded 4111 -#define EPP_ExWAVAudioLink 4112 #define EPP_ExOleObjStg 4113 -#define EPP_ExCDAudioAtom 4114 -#define EPP_ExWAVAudioEmbeddedAtom 4115 #define EPP_AnimationInfo 4116 -#define EPP_RTFDateTimeMCAtom 4117 #define EPP_ProgTags 5000 -#define EPP_ProgStringTag 5001 #define EPP_ProgBinaryTag 5002 #define EPP_BinaryTagData 5003 -#define EPP_PrintOptions 6000 -#define EPP_PersistPtrFullBlock 6001 #define EPP_PersistPtrIncrementalBlock 6002 -#define EPP_RulerIndentAtom 10000 -#define EPP_GscalingAtom 10001 -#define EPP_GrColorAtom 10002 -#define EPP_GLPointAtom 10003 #define EPP_Comment10 12000 #define EPP_CommentAtom10 12001 #define EPP_PLACEHOLDER_NONE 0 // 0 None #define EPP_PLACEHOLDER_MASTERTITLE 1 // 1 Master title #define EPP_PLACEHOLDER_MASTERBODY 2 // 2 Master body -#define EPP_PLACEHOLDER_MASTERCENTEREDTITLE 3 // 3 Master centered title #define EPP_PLACEHOLDER_MASTERSUBTITLE 4 // 10 Master subtitle #define EPP_PLACEHOLDER_MASTERNOTESSLIDEIMAGE 5 // 4 Master notes slide image #define EPP_PLACEHOLDER_MASTERNOTESBODYIMAGE 6 // 5 Master notes body image @@ -216,20 +124,8 @@ #define EPP_PLACEHOLDER_MASTERFOOTER 9 // 8 Master footer #define EPP_PLACEHOLDER_MASTERHEADER 10 // 9 Master header #define EPP_PLACEHOLDER_GENERICTEXTOBJECT // 11 Generic text object -#define EPP_PLACEHOLDER_TITLE 13 // 12 Title -#define EPP_PLACEHOLDER_BODY 14 // 13 Body #define EPP_PLACEHOLDER_NOTESBODY 12 // 14 Notes body -#define EPP_PLACEHOLDER_CENTEREDTITLE 15 // 15 Centered title -#define EPP_PLACEHOLDER_SUBTITLE 16 // 16 Subtitle -#define EPP_PLACEHOLDER_VERTICALTEXTTITLE 17 // 17 Vertical text title -#define EPP_PLACEHOLDER_VERTICALTEXTBODY 18 // 18 Vertical text body #define EPP_PLACEHOLDER_NOTESSLIDEIMAGE 11 // 19 Notes slide image -#define EPP_PLACEHOLDER_OBJECT 19 // 20 Object (no matter the size) -#define EPP_PLACEHOLDER_GRAPH 20 // 21 Graph -#define EPP_PLACEHOLDER_TABLE 21 // 22 Table -#define EPP_PLACEHOLDER_CLIPART 22 // 23 Clip Art -#define EPP_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart -#define EPP_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip #define EPP_TEXTTYPE_Title 0 #define EPP_TEXTTYPE_Body 1 @@ -242,10 +138,8 @@ #define EPP_TEXTTYPE_QuarterBody 8 // ( body in four-body slide ) #define EPP_SLIDESIZE_TYPEONSCREEN 0 -#define EPP_SLIDESIZE_TYPELETTERSIZERPAPER 1 #define EPP_SLIDESIZE_TYPEA4PAPER 2 #define EPP_SLIDESIZE_TYPE35MM 3 -#define EPP_SLIDESIZE_TYPEOVERHEAD 4 #define EPP_SLIDESIZE_TYPEBANNER 5 #define EPP_SLIDESIZE_TYPECUSTOM 6 diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index bb633fbade2a..eba3086029b8 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -41,11 +41,8 @@ #include <boost/scoped_ptr.hpp> #define PUB_LOWRES_WIDTH 640 -#define PUB_LOWRES_HEIGHT 480 #define PUB_MEDRES_WIDTH 800 -#define PUB_MEDRES_HEIGHT 600 #define PUB_HIGHRES_WIDTH 1024 -#define PUB_HIGHRES_HEIGHT 768 #define PUB_THUMBNAIL_WIDTH 256 #define PUB_THUMBNAIL_HEIGHT 192 diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx index 7d2ea78f2581..ed968bca3ff2 100644 --- a/sd/source/filter/ppt/propread.hxx +++ b/sd/source/filter/ppt/propread.hxx @@ -36,27 +36,12 @@ #define PID_TEMPLATE 0x07 #define PID_LASTAUTHOR 0x08 #define PID_REVNUMBER 0x09 -#define PID_EDITTIME 0x0a -#define PID_LASTPRINTED_DTM 0x0b #define PID_CREATE_DTM 0x0c -#define PID_LASTSAVED_DTM 0x0d // DocumentSummaryInformation -#define PID_CATEGORY 0x02 -#define PID_PRESFORMAT 0x03 -#define PID_BYTECOUNT 0x04 -#define PID_LINECOUNT 0x05 -#define PID_PARACOUNT 0x06 #define PID_SLIDECOUNT 0x07 -#define PID_NOTECOUNT 0x08 -#define PID_HIDDENCOUNT 0x09 -#define PID_MMCLIPCOUNT 0x0a -#define PID_SCALE 0x0b #define PID_HEADINGPAIR 0x0c #define PID_DOCPARTS 0x0d -#define PID_MANAGER 0x0e -#define PID_COMPANY 0x0f -#define PID_LINKSDIRTY 0x10 #define VT_EMPTY 0 #define VT_NULL 1 diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 61f4dd0d1d56..a3ce85b949f0 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -30,7 +30,6 @@ // Option ranges -#define SD_OPTIONS_NONE 0x00000000 #define SD_OPTIONS_ALL 0xffffffff #define SD_OPTIONS_LAYOUT 0x00000001 diff --git a/sd/source/ui/inc/unoprnms.hxx b/sd/source/ui/inc/unoprnms.hxx index cb20a4af2882..d0af59c17a9c 100644 --- a/sd/source/ui/inc/unoprnms.hxx +++ b/sd/source/ui/inc/unoprnms.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_UNOPRNMS_HXX #define INCLUDED_SD_SOURCE_UI_INC_UNOPRNMS_HXX -#define UNO_NAME_MODEL_LANGUAGE "CharLocale" -#define UNO_NAME_MODEL_TABSTOP "TabStop" #define UNO_NAME_PAGE_BACKGROUND "Background" #define UNO_NAME_PAGE_LEFT "BorderLeft" @@ -33,7 +31,6 @@ #define UNO_NAME_PAGE_HEIGHT "Height" #define UNO_NAME_PAGE_LAYOUT "Layout" #define UNO_NAME_PAGE_NUMBER "Number" -#define UNO_NAME_PAGE_OBJECTS "Objects" #define UNO_NAME_PAGE_ORIENTATION "Orientation" #define UNO_NAME_PAGE_SPEED "Speed" #define UNO_NAME_PAGE_WIDTH "Width" @@ -67,18 +64,6 @@ #define UNO_NAME_LAYER_VISIBLE "IsVisible" #define UNO_NAME_LAYER_NAME "Name" -#define UNO_NAME_SHOW_ALLOWANIM "AllowAnimations" -#define UNO_NAME_SHOW_CUSTOMSHOW "CustomShow" -#define UNO_NAME_SHOW_FIRSTPAGE "FirstPage" -#define UNO_NAME_SHOW_ONTOP "IsAlwaysOnTop" -#define UNO_NAME_SHOW_AUTOMATIC "IsAutomatic" -#define UNO_NAME_SHOW_ENDLESS "IsEndless" -#define UNO_NAME_SHOW_FULLSCREEN "IsFullScreen" -#define UNO_NAME_SHOW_MOUSEVISIBLE "IsMouseVisible" -#define UNO_NAME_SHOW_PAGERANGE "PageRange" -#define UNO_NAME_SHOW_PAUSE "Pause" -#define UNO_NAME_SHOW_STARTWITHNAV "StartWithNavigator" -#define UNO_NAME_SHOW_USEPEN "UsePen" #define UNO_NAME_SEARCH_BACKWARDS "SearchBackwards" #define UNO_NAME_SEARCH_CASE "SearchCaseSensitive" @@ -87,7 +72,6 @@ #define UNO_NAME_LINKDISPLAYNAME "LinkDisplayName" #define UNO_NAME_LINKDISPLAYBITMAP "LinkDisplayBitmap" -#define UNO_NAME_STYLE_FAMILY "Family" #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h index 612b6eeeda2f..88d913fa25d0 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h @@ -381,10 +381,7 @@ extern "C" { #endif #define LF '\n' -#define CRSTR "\r" -#define LFSTR "\n" #define CRLF "\r\n" -#define CRCR "\r\r" #if 0 #pragma mark == Compatibility == @@ -1107,22 +1104,10 @@ typedef int32_t Duration; // Seconds <-> Minutes <-> Hours <-> Days <-> Weeks <-> Months <-> Years conversions -#define kNanosecondsPerMicrosecond 1000 -#define kNanosecondsPerMillisecond 1000000 -#define kNanosecondsPerSecond 1000000000 -#define kMicrosecondsPerSecond 1000000 -#define kMicrosecondsPerMillisecond 1000 -#define kMillisecondsPerSecond 1000 -#define kSecondsPerMinute 60 #define kSecondsPerHour ( 60 * 60 ) // 3600 #define kSecondsPerDay ( 60 * 60 * 24 ) // 86400 #define kSecondsPerWeek ( 60 * 60 * 24 * 7 ) // 604800 -#define kMinutesPerHour 60 #define kMinutesPerDay ( 60 * 24 ) // 1440 -#define kHoursPerDay 24 -#define kDaysPerWeek 7 -#define kWeeksPerYear 52 -#define kMonthsPerYear 12 /*! @defined VersionStages @@ -1219,262 +1204,6 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #define hex_digit8( a ) HEX_DIGIT_ ## a #define hex_digit4( a ) HEX_DIGIT_ ## 0000 ## a -#define HEX_DIGIT_00000000 00 -#define HEX_DIGIT_00000001 01 -#define HEX_DIGIT_00000010 02 -#define HEX_DIGIT_00000011 03 -#define HEX_DIGIT_00000100 04 -#define HEX_DIGIT_00000101 05 -#define HEX_DIGIT_00000110 06 -#define HEX_DIGIT_00000111 07 -#define HEX_DIGIT_00001000 08 -#define HEX_DIGIT_00001001 09 -#define HEX_DIGIT_00001010 0A -#define HEX_DIGIT_00001011 0B -#define HEX_DIGIT_00001100 0C -#define HEX_DIGIT_00001101 0D -#define HEX_DIGIT_00001110 0E -#define HEX_DIGIT_00001111 0F -#define HEX_DIGIT_00010000 10 -#define HEX_DIGIT_00010001 11 -#define HEX_DIGIT_00010010 12 -#define HEX_DIGIT_00010011 13 -#define HEX_DIGIT_00010100 14 -#define HEX_DIGIT_00010101 15 -#define HEX_DIGIT_00010110 16 -#define HEX_DIGIT_00010111 17 -#define HEX_DIGIT_00011000 18 -#define HEX_DIGIT_00011001 19 -#define HEX_DIGIT_00011010 1A -#define HEX_DIGIT_00011011 1B -#define HEX_DIGIT_00011100 1C -#define HEX_DIGIT_00011101 1D -#define HEX_DIGIT_00011110 1E -#define HEX_DIGIT_00011111 1F -#define HEX_DIGIT_00100000 20 -#define HEX_DIGIT_00100001 21 -#define HEX_DIGIT_00100010 22 -#define HEX_DIGIT_00100011 23 -#define HEX_DIGIT_00100100 24 -#define HEX_DIGIT_00100101 25 -#define HEX_DIGIT_00100110 26 -#define HEX_DIGIT_00100111 27 -#define HEX_DIGIT_00101000 28 -#define HEX_DIGIT_00101001 29 -#define HEX_DIGIT_00101010 2A -#define HEX_DIGIT_00101011 2B -#define HEX_DIGIT_00101100 2C -#define HEX_DIGIT_00101101 2D -#define HEX_DIGIT_00101110 2E -#define HEX_DIGIT_00101111 2F -#define HEX_DIGIT_00110000 30 -#define HEX_DIGIT_00110001 31 -#define HEX_DIGIT_00110010 32 -#define HEX_DIGIT_00110011 33 -#define HEX_DIGIT_00110100 34 -#define HEX_DIGIT_00110101 35 -#define HEX_DIGIT_00110110 36 -#define HEX_DIGIT_00110111 37 -#define HEX_DIGIT_00111000 38 -#define HEX_DIGIT_00111001 39 -#define HEX_DIGIT_00111010 3A -#define HEX_DIGIT_00111011 3B -#define HEX_DIGIT_00111100 3C -#define HEX_DIGIT_00111101 3D -#define HEX_DIGIT_00111110 3E -#define HEX_DIGIT_00111111 3F -#define HEX_DIGIT_01000000 40 -#define HEX_DIGIT_01000001 41 -#define HEX_DIGIT_01000010 42 -#define HEX_DIGIT_01000011 43 -#define HEX_DIGIT_01000100 44 -#define HEX_DIGIT_01000101 45 -#define HEX_DIGIT_01000110 46 -#define HEX_DIGIT_01000111 47 -#define HEX_DIGIT_01001000 48 -#define HEX_DIGIT_01001001 49 -#define HEX_DIGIT_01001010 4A -#define HEX_DIGIT_01001011 4B -#define HEX_DIGIT_01001100 4C -#define HEX_DIGIT_01001101 4D -#define HEX_DIGIT_01001110 4E -#define HEX_DIGIT_01001111 4F -#define HEX_DIGIT_01010000 50 -#define HEX_DIGIT_01010001 51 -#define HEX_DIGIT_01010010 52 -#define HEX_DIGIT_01010011 53 -#define HEX_DIGIT_01010100 54 -#define HEX_DIGIT_01010101 55 -#define HEX_DIGIT_01010110 56 -#define HEX_DIGIT_01010111 57 -#define HEX_DIGIT_01011000 58 -#define HEX_DIGIT_01011001 59 -#define HEX_DIGIT_01011010 5A -#define HEX_DIGIT_01011011 5B -#define HEX_DIGIT_01011100 5C -#define HEX_DIGIT_01011101 5D -#define HEX_DIGIT_01011110 5E -#define HEX_DIGIT_01011111 5F -#define HEX_DIGIT_01100000 60 -#define HEX_DIGIT_01100001 61 -#define HEX_DIGIT_01100010 62 -#define HEX_DIGIT_01100011 63 -#define HEX_DIGIT_01100100 64 -#define HEX_DIGIT_01100101 65 -#define HEX_DIGIT_01100110 66 -#define HEX_DIGIT_01100111 67 -#define HEX_DIGIT_01101000 68 -#define HEX_DIGIT_01101001 69 -#define HEX_DIGIT_01101010 6A -#define HEX_DIGIT_01101011 6B -#define HEX_DIGIT_01101100 6C -#define HEX_DIGIT_01101101 6D -#define HEX_DIGIT_01101110 6E -#define HEX_DIGIT_01101111 6F -#define HEX_DIGIT_01110000 70 -#define HEX_DIGIT_01110001 71 -#define HEX_DIGIT_01110010 72 -#define HEX_DIGIT_01110011 73 -#define HEX_DIGIT_01110100 74 -#define HEX_DIGIT_01110101 75 -#define HEX_DIGIT_01110110 76 -#define HEX_DIGIT_01110111 77 -#define HEX_DIGIT_01111000 78 -#define HEX_DIGIT_01111001 79 -#define HEX_DIGIT_01111010 7A -#define HEX_DIGIT_01111011 7B -#define HEX_DIGIT_01111100 7C -#define HEX_DIGIT_01111101 7D -#define HEX_DIGIT_01111110 7E -#define HEX_DIGIT_01111111 7F -#define HEX_DIGIT_10000000 80 -#define HEX_DIGIT_10000001 81 -#define HEX_DIGIT_10000010 82 -#define HEX_DIGIT_10000011 83 -#define HEX_DIGIT_10000100 84 -#define HEX_DIGIT_10000101 85 -#define HEX_DIGIT_10000110 86 -#define HEX_DIGIT_10000111 87 -#define HEX_DIGIT_10001000 88 -#define HEX_DIGIT_10001001 89 -#define HEX_DIGIT_10001010 8A -#define HEX_DIGIT_10001011 8B -#define HEX_DIGIT_10001100 8C -#define HEX_DIGIT_10001101 8D -#define HEX_DIGIT_10001110 8E -#define HEX_DIGIT_10001111 8F -#define HEX_DIGIT_10010000 90 -#define HEX_DIGIT_10010001 91 -#define HEX_DIGIT_10010010 92 -#define HEX_DIGIT_10010011 93 -#define HEX_DIGIT_10010100 94 -#define HEX_DIGIT_10010101 95 -#define HEX_DIGIT_10010110 96 -#define HEX_DIGIT_10010111 97 -#define HEX_DIGIT_10011000 98 -#define HEX_DIGIT_10011001 99 -#define HEX_DIGIT_10011010 9A -#define HEX_DIGIT_10011011 9B -#define HEX_DIGIT_10011100 9C -#define HEX_DIGIT_10011101 9D -#define HEX_DIGIT_10011110 9E -#define HEX_DIGIT_10011111 9F -#define HEX_DIGIT_10100000 A0 -#define HEX_DIGIT_10100001 A1 -#define HEX_DIGIT_10100010 A2 -#define HEX_DIGIT_10100011 A3 -#define HEX_DIGIT_10100100 A4 -#define HEX_DIGIT_10100101 A5 -#define HEX_DIGIT_10100110 A6 -#define HEX_DIGIT_10100111 A7 -#define HEX_DIGIT_10101000 A8 -#define HEX_DIGIT_10101001 A9 -#define HEX_DIGIT_10101010 AA -#define HEX_DIGIT_10101011 AB -#define HEX_DIGIT_10101100 AC -#define HEX_DIGIT_10101101 AD -#define HEX_DIGIT_10101110 AE -#define HEX_DIGIT_10101111 AF -#define HEX_DIGIT_10110000 B0 -#define HEX_DIGIT_10110001 B1 -#define HEX_DIGIT_10110010 B2 -#define HEX_DIGIT_10110011 B3 -#define HEX_DIGIT_10110100 B4 -#define HEX_DIGIT_10110101 B5 -#define HEX_DIGIT_10110110 B6 -#define HEX_DIGIT_10110111 B7 -#define HEX_DIGIT_10111000 B8 -#define HEX_DIGIT_10111001 B9 -#define HEX_DIGIT_10111010 BA -#define HEX_DIGIT_10111011 BB -#define HEX_DIGIT_10111100 BC -#define HEX_DIGIT_10111101 BD -#define HEX_DIGIT_10111110 BE -#define HEX_DIGIT_10111111 BF -#define HEX_DIGIT_11000000 C0 -#define HEX_DIGIT_11000001 C1 -#define HEX_DIGIT_11000010 C2 -#define HEX_DIGIT_11000011 C3 -#define HEX_DIGIT_11000100 C4 -#define HEX_DIGIT_11000101 C5 -#define HEX_DIGIT_11000110 C6 -#define HEX_DIGIT_11000111 C7 -#define HEX_DIGIT_11001000 C8 -#define HEX_DIGIT_11001001 C9 -#define HEX_DIGIT_11001010 CA -#define HEX_DIGIT_11001011 CB -#define HEX_DIGIT_11001100 CC -#define HEX_DIGIT_11001101 CD -#define HEX_DIGIT_11001110 CE -#define HEX_DIGIT_11001111 CF -#define HEX_DIGIT_11010000 D0 -#define HEX_DIGIT_11010001 D1 -#define HEX_DIGIT_11010010 D2 -#define HEX_DIGIT_11010011 D3 -#define HEX_DIGIT_11010100 D4 -#define HEX_DIGIT_11010101 D5 -#define HEX_DIGIT_11010110 D6 -#define HEX_DIGIT_11010111 D7 -#define HEX_DIGIT_11011000 D8 -#define HEX_DIGIT_11011001 D9 -#define HEX_DIGIT_11011010 DA -#define HEX_DIGIT_11011011 DB -#define HEX_DIGIT_11011100 DC -#define HEX_DIGIT_11011101 DD -#define HEX_DIGIT_11011110 DE -#define HEX_DIGIT_11011111 DF -#define HEX_DIGIT_11100000 E0 -#define HEX_DIGIT_11100001 E1 -#define HEX_DIGIT_11100010 E2 -#define HEX_DIGIT_11100011 E3 -#define HEX_DIGIT_11100100 E4 -#define HEX_DIGIT_11100101 E5 -#define HEX_DIGIT_11100110 E6 -#define HEX_DIGIT_11100111 E7 -#define HEX_DIGIT_11101000 E8 -#define HEX_DIGIT_11101001 E9 -#define HEX_DIGIT_11101010 EA -#define HEX_DIGIT_11101011 EB -#define HEX_DIGIT_11101100 EC -#define HEX_DIGIT_11101101 ED -#define HEX_DIGIT_11101110 EE -#define HEX_DIGIT_11101111 EF -#define HEX_DIGIT_11110000 F0 -#define HEX_DIGIT_11110001 F1 -#define HEX_DIGIT_11110010 F2 -#define HEX_DIGIT_11110011 F3 -#define HEX_DIGIT_11110100 F4 -#define HEX_DIGIT_11110101 F5 -#define HEX_DIGIT_11110110 F6 -#define HEX_DIGIT_11110111 F7 -#define HEX_DIGIT_11111000 F8 -#define HEX_DIGIT_11111001 F9 -#define HEX_DIGIT_11111010 FA -#define HEX_DIGIT_11111011 FB -#define HEX_DIGIT_11111100 FC -#define HEX_DIGIT_11111101 FD -#define HEX_DIGIT_11111110 FE -#define HEX_DIGIT_11111111 FF #if 0 #pragma mark == Debugging == diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h index b4e6ab2008f9..11d927a60fa5 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h @@ -282,27 +282,15 @@ typedef int32_t DebugLevel; // Levels -#define kDebugLevelMask 0x0000FFFF -#define kDebugLevelChatty 100 -#define kDebugLevelVerbose 500 -#define kDebugLevelTrace 800 #define kDebugLevelInfo 1000 #define kDebugLevelNotice 3000 #define kDebugLevelWarning 5000 #define kDebugLevelAssert 6000 -#define kDebugLevelRequire 7000 #define kDebugLevelError 8000 -#define kDebugLevelCritical 9000 -#define kDebugLevelAlert 10000 -#define kDebugLevelEmergency 11000 -#define kDebugLevelTragic 12000 #define kDebugLevelMax 0x0000FFFF // Level Flags -#define kDebugLevelFlagMask 0xFFFF0000 -#define kDebugLevelFlagStackTrace 0x00010000 -#define kDebugLevelFlagDebugBreak 0x00020000 /*! @typedef LogLevel @@ -313,21 +301,6 @@ typedef int32_t DebugLevel; typedef int32_t LogLevel; #define kLogLevelUninitialized -1L -#define kLogLevelAll 0L -#define kLogLevelChatty 100L -#define kLogLevelVerbose 500L -#define kLogLevelTrace 800L -#define kLogLevelInfo 1000L -#define kLogLevelNotice 3000L -#define kLogLevelWarning 4000L -#define kLogLevelAssert 6000L -#define kLogLevelRequire 7000L -#define kLogLevelError 8000L -#define kLogLevelCritical 9000L -#define kLogLevelAlert 10000L -#define kLogLevelEmergency 11000L -#define kLogLevelTragic 12000L -#define kLogLevelOff 0x0000FFFEL #if 0 #pragma mark == Properties == @@ -344,7 +317,6 @@ typedef uint32_t DebugPropertyTag; #define kDebugPropertyTagPrintLevelMin 0x6D696E70U // 'minp' Get: 1st param = DebugLevel * // Set: 1st param = DebugLevel -#define kDebugPropertyTagPrintLevel kDebugPropertyTagPrintLevelMin #define kDebugPropertyTagPrintLevelMax 0x706D786CU // 'maxp' Get: 1st param = DebugLevel * // Set: 1st param = DebugLevel diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h index 1549a9d67779..31daaeb91caf 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h @@ -562,7 +562,6 @@ enum /* Maximum length, in bytes, of a service name represented as a */ /* literal C-String, including the terminating NULL at the end. */ -#define kDNSServiceMaxServiceName 64 /* Maximum length, in bytes, of a domain name represented as an *escaped* C-String */ /* including the final trailing dot, and the C-String terminating NULL at the end. */ @@ -2465,8 +2464,6 @@ DNSServiceErrorType DNSSD_API DNSServiceSleepKeepalive #ifdef __APPLE_API_PRIVATE -#define kDNSServiceCompPrivateDNS "PrivateDNS" -#define kDNSServiceCompMulticastDNS "MulticastDNS" #endif //__APPLE_API_PRIVATE diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h index 17d84f99dd6e..568c5218dcb8 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h @@ -200,7 +200,6 @@ uint16_t get_uint16(const char **ptr, const char *end); #define put_flags put_uint32 #define get_flags get_uint32 -#define put_error_code put_uint32 #define get_error_code get_uint32 int put_string(const char *str, char **ptr); diff --git a/sd/source/ui/view/DocumentRenderer.hrc b/sd/source/ui/view/DocumentRenderer.hrc index b1b07d8e321b..942e83f7f6c9 100644 --- a/sd/source/ui/view/DocumentRenderer.hrc +++ b/sd/source/ui/view/DocumentRenderer.hrc @@ -30,7 +30,6 @@ #define _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT 13 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME 14 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE 16 -#define _STR_IMPRESS_PRINT_UI_IS_PRINT_TIME 18 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN 20 #define _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP 22 |