hrc cleanup: Remove unused defines

All of those defines (should) not be used at any point in the code.
False positives may exist, because some macro names are getting
generated by some template/macro foo. This is the version which
compiled fine for me.

Also there are many commented out lines removed.

Change-Id: I6394024682e4ab3691eb72707a9363d41ba31df8

4 files changed, 26 insertions, 384 deletions

diff --git a/svl/inc/svl/cntwids.hrc b/svl/inc/svl/cntwids.hrc
index d14cf590d740..cb1148b7d7db 100644
--- a/svl/inc/svl/cntwids.hrc
+++ b/svl/inc/svl/cntwids.hrc
@@ -37,35 +37,8 @@
 
 #define WID_CHAOS_START 500
 
-//FUNC MSG
-#define WID_MARK_THREAD_MARKED              (499)
-#define WID_MARK_THREAD_UNMARKED            (498)
-
-// ARGS
-#define WID_DUMMY_ARG1                      (WID_CHAOS_START +  0)
-#define WID_FACTORY_NO                      (WID_CHAOS_START +  1)
-#define WID_FACTORY_NAME                    (WID_CHAOS_START +  2)
-#define WID_NEWS_XREF                       (WID_CHAOS_START +  3)
-#define WID_CREATION_FLAGS                  (WID_CHAOS_START +  4)
-#define WID_FACTORY_HELP_ID                 (WID_CHAOS_START +  5)
-
-//FUNC MSG
-#define WID_MSG_START                       (WID_CHAOS_START +  6)
-#define WID_MAIL_REPLY                      (WID_CHAOS_START +  6)
-#define WID_POST_REPLY                      (WID_CHAOS_START +  7)
-#define WID_FORWARD                         (WID_CHAOS_START +  8)
-#define WID_MARK_THREAD_READ                (WID_CHAOS_START +  9)
-#define WID_HIDE_THREAD                     (WID_CHAOS_START + 10)
-#define WID_HIDE_AUTHOR                     (WID_CHAOS_START + 11)
-#define WID_HIDE_SUBJECT                    (WID_CHAOS_START + 12)
-#define WID_RESEND_MSG                      (WID_CHAOS_START + 13)
-#define WID_MARK_THREAD_UNREAD              (WID_CHAOS_START + 14)
-
 //PROP MSG
 #define WID_PRIORITY                        (WID_CHAOS_START + 15)
-#define WID_RULE_APPLIED                    (WID_CHAOS_START + 16)
-#define WID_MSG_LOCK                        (WID_CHAOS_START + 17)
-#define WID_SEEN_STATUS                     (WID_CHAOS_START + 18)
 #define WID_REPLY_TO                        (WID_CHAOS_START + 19)
 #define WID_IN_REPLY_TO                     (WID_CHAOS_START + 20)
 
@@ -83,88 +56,41 @@
 
 #define WID_OUTMSGINTERNALSTATE             (WID_CHAOS_START + 31)
 #define WID_RECIPIENTLIST                   (WID_CHAOS_START + 32)
-#define WID_MSG_END                         (WID_CHAOS_START + 32)
-
-//FUNC ALL
-#define WID_ALL_START                       (WID_CHAOS_START + 33)
-#define WID_DEFAULT                         (WID_CHAOS_START + 33)
-#define WID_OPEN                            (WID_CHAOS_START + 34)
-#define WID_DELETE                          (WID_CHAOS_START + 35)
-#define WID_CUT                             (WID_CHAOS_START + 36)
-#define WID_COPY                            (WID_CHAOS_START + 37)
-#define WID_PASTE                           (WID_CHAOS_START + 38)
-#define WID_RENAME                          (WID_CHAOS_START + 39)
-
-#define WID_HAS_DATA                        (WID_CHAOS_START + 40)
-#define WID_GETDATA                         (WID_CHAOS_START + 41)
-#define WID_PUTDATA                         (WID_CHAOS_START + 42)
 
 //PROP ALL
-#define WID_INTERIM_URL                     (WID_CHAOS_START + 43)
 #define WID_CONTENT_TYPE                    (WID_CHAOS_START + 44)
 
 #define WID_OWN_URL                         (WID_CHAOS_START + 45)
 #define WID_REAL_URL                        (WID_CHAOS_START + 46)
-#define WID_OBSOLETE_TITLE                  (WID_CHAOS_START + 47)
 #define WID_FLAG_READONLY                   (WID_CHAOS_START + 48)
 
-#define WID_REFERED_URL                     (WID_CHAOS_START + 49)
-#define WID_REFERER_COUNT                   (WID_CHAOS_START + 50)
 #define WID_FLAG_IS_FOLDER                  (WID_CHAOS_START + 51)
 #define WID_FLAG_HAS_FOLDER                 (WID_CHAOS_START + 52)
 #define WID_FLAG_IS_MESSAGE                 (WID_CHAOS_START + 53)
-#define WID_FLAG_IS_DOCUMENT                (WID_FLAG_IS_MESSAGE)
 #define WID_FLAG_HAS_MESSAGES               (WID_CHAOS_START + 54)
 
 #define WID_DATE_CREATED                    (WID_CHAOS_START + 55)
 #define WID_DATE_MODIFIED                   (WID_CHAOS_START + 56)
-#define WID_VIEW_DESCRIPTION                (WID_CHAOS_START + 57)
 #define WID_IS_READ                         (WID_CHAOS_START + 58)
 #define WID_IS_MARKED                       (WID_CHAOS_START + 59)
-#define WID_ALL_END                         (WID_CHAOS_START + 59)
-
-//FUNC FOLDER
-#define WID_FOLDER_START                    (WID_CHAOS_START + 60)
-#define WID_SYNCHRONIZE                     (WID_CHAOS_START + 60)
-#define WID_CREATE_NEW                      (WID_CHAOS_START + 61)
-#define WID_INSERT                          (WID_CHAOS_START + 62)
-#define WID_UPDATE                          (WID_CHAOS_START + 63)
-#define WID_IMPORT                          (WID_CHAOS_START + 64)
 
 //PROP FOLDER VIEW
-#define WID_DUMMY_PROPFOLDERVIEW1           (WID_CHAOS_START + 65)
 #define WID_THREADING                       (WID_CHAOS_START + 66)
 #define WID_FOLDERVIEW_MODE                 (WID_CHAOS_START + 69)
 #define WID_MESSAGEVIEW_MODE                (WID_CHAOS_START + 70)
 #define WID_SENTMESSAGEVIEW_MODE            (WID_CHAOS_START + 71)
-#define WID_SORTING                         (WID_CHAOS_START + 72)
 #define WID_THREADED                        (WID_CHAOS_START + 73)
-#define WID_FILTERED                        (WID_CHAOS_START + 74)
 #define WID_RULES                           (WID_CHAOS_START + 75)
 #define WID_SUBSCRNEWSGROUPCOUNT            (WID_CHAOS_START + 76)
 #define WID_FLAG_SUBSCRIBED                 (WID_CHAOS_START + 77)
-#define WID_FLAG_SUPPORTMODE                (WID_CHAOS_START + 78)
 
 //PROP FOLDER DIR
-#define WID_DUMMY_FOLDERDIR1                (WID_CHAOS_START + 79)
 #define WID_TOTALCONTENTCOUNT               (WID_CHAOS_START + 80)
-#define WID_KNOWN_RANGES                    (WID_CHAOS_START + 83)
-#define WID_IMAPFOLDERINFO                  (WID_CHAOS_START + 84)
 
 //PROP FOLDER USER
-#define WID_DUMMY_FOLDERUSER1               (WID_CHAOS_START + 85)
 #define WID_SEENCONTENTCOUNT                (WID_CHAOS_START + 86)
-#define WID_UNREAD_ARTICLECOUNT             (WID_SEENCONTENTCOUNT)
-#define WID_SENTCONTENTCOUNT                (WID_SEENCONTENTCOUNT)
-#define WID_READ_RANGES                     (WID_CHAOS_START + 87)
-#define WID_MARK_RANGES                     (WID_CHAOS_START + 88)
-#define WID_FOLDER_END                      (WID_CHAOS_START + 88)
 
 //PROP BOXALL
-#define WID_BOXALL_START                    (WID_CHAOS_START + 89)
-// Used for d&d of View Storages...
-#define WID_PREPARE_MOVE                    (WID_CHAOS_START + 89)
-#define WID_OUTTRAY_WANTED                  (WID_CHAOS_START + 90)
 #define WID_USERNAME                        (WID_CHAOS_START + 91)
 #define WID_PASSWORD                        (WID_CHAOS_START + 92)
 #define WID_SERVERNAME                      (WID_CHAOS_START + 93)
@@ -175,59 +101,27 @@
 
 #define WID_AUTOUPDATE_INTERVAL             (WID_CHAOS_START + 105)
 #define WID_UPDATE_ENABLED                  (WID_CHAOS_START + 106)
-#define WID_BOXALL_END                      (WID_CHAOS_START + 106)
 
 //PROP BOX RNMGR
-#define WID_BOXEXT_START                    (WID_CHAOS_START + 107)
 #define WID_CONNECTION_MODE                 (WID_CHAOS_START + 107)
-#define WID_NEWS_GROUPLIST                  (WID_CHAOS_START + 108)
 #define WID_MESSAGE_STOREMODE               (WID_CHAOS_START + 109)
 #define WID_DELETE_ON_SERVER                (WID_CHAOS_START + 110)
 
-//PROP BOX USER
-
-//PROP BOX OUT DIR
-#define WID_OUTMSGEXTERNALSTATE             (WID_CHAOS_START + 111)
-
-//PROP RNM
-#define WID_RNM_UPDATETIMER_LIST            (WID_CHAOS_START + 112)
-#define WID_BOXEXT_END                      (WID_CHAOS_START + 112)
-
 //////////////////////////////////////////////////////////////////////////
 // MISC - Added after initial pool version
 //////////////////////////////////////////////////////////////////////////
 
-// PROP BOX
-#define WID_SERVER_RANGES                   (WID_CHAOS_START + 113)
-#define WID_LAST_UPDATE                     (WID_CHAOS_START + 114)
-#define WID_LAST_MSGID                      (WID_CHAOS_START + 115)
-#define WID_LAST_UID                        (WID_CHAOS_START + 116)
-
-// FUNC ALL
-#define WID_UNDELETE                        (WID_CHAOS_START + 117)
-#define WID_CLOSE                           (WID_CHAOS_START + 118)
-#define WID_REOPEN                          (WID_CHAOS_START + 119)
-
-// PROP RNM
-#define WID_RNM_FILECONVERSION_LIST         (WID_CHAOS_START + 120)
-
 // PROP FOLDER
 #define WID_SHOW_MSGS_HAS_TIMELIMIT         (WID_CHAOS_START + 121)
 #define WID_SHOW_MSGS_TIMELIMIT             (WID_CHAOS_START + 122)
 #define WID_STORE_MSGS_HAS_TIMELIMIT        (WID_CHAOS_START + 123)
 #define WID_STORE_MSGS_TIMELIMIT            (WID_CHAOS_START + 124)
 
-// PROP BOX
-
 //////////////////////////////////////////////////////////////////////////
 // WID's added after SO 4.0 release ( SUPD > 364 )
 //////////////////////////////////////////////////////////////////////////
 
-// PROP ALL
-#define WID_PROPERTYLIST                    (WID_CHAOS_START + 126)
-
 // PROP BOXALL
-#define WID_BOXALL_START2                   (WID_CHAOS_START + 127)
 #define WID_SEND_PUBLIC_PROT_ID             (WID_CHAOS_START + 127)
 #define WID_SEND_PRIVATE_PROT_ID            (WID_CHAOS_START + 128)
 #define WID_SEND_PUBLIC_OUTBOXPROPS         (WID_CHAOS_START + 129)
@@ -239,158 +133,58 @@
 #define WID_SEND_FROM_DEFAULT               (WID_CHAOS_START + 135)
 #define WID_VIM_POPATH                      (WID_CHAOS_START + 136)
 #define WID_SEND_VIM_POPATH                 (WID_CHAOS_START + 137)
-#define WID_PURGE                           (WID_CHAOS_START + 138)
-#define WID_CLEAN_CACHE                     (WID_CHAOS_START + 139)
-#define WID_SEARCH                          (WID_CHAOS_START + 140)
-#define WID_JOURNAL                         (WID_CHAOS_START + 141)
 #define WID_LOCALBASE                       (WID_CHAOS_START + 142)
-#define WID_BOXALL_END2                     (WID_CHAOS_START + 142)
 
 // PROP DOCUMENT
 #define WID_DOCUMENT_HEADER                 (WID_CHAOS_START + 143)
 #define WID_DOCUMENT_BODY                   (WID_CHAOS_START + 144)
 #define WID_DOCUMENT_SIZE                   (WID_CHAOS_START + 145)
 
-// PROP ALL
-#define WID_SIZE                            WID_DOCUMENT_SIZE
-
-// PROP PROJECT
-#define WID_PRJ_MEDIUM                      (WID_CHAOS_START + 146)
-#define WID_PRJ_FILENAMECONVENTION          (WID_CHAOS_START + 147)
-
 // PROP FSYS
 #define WID_FSYS_DISKSPACE_LEFT             (WID_CHAOS_START + 148)
-#define WID_TRANSFER                        (WID_CHAOS_START + 149)
 
 // PROP ALL
 #define WID_KEYWORDS                        (WID_CHAOS_START + 150)
-#define WID_IS_PROTECTED                    (WID_CHAOS_START + 151)
 
 // PROP SEARCH
 #define WID_SEARCH_CRITERIA                 (WID_CHAOS_START + 152)
 #define WID_SEARCH_LOCATIONS                (WID_CHAOS_START + 153)
 #define WID_SEARCH_RECURSIVE                (WID_CHAOS_START + 154)
-#define WID_SEARCH_FOLDER_VIEW              (WID_CHAOS_START + 155)
-#define WID_SEARCH_DOCUMENT_VIEW            (WID_CHAOS_START + 156)
 
 // PROP Channel
-#define WID_SCHEDULE_RANGE                  (WID_CHAOS_START + 157)
-#define WID_ALLOWED_SCHEDULE_RANGE          (WID_CHAOS_START + 158)
 #define WID_TARGET_URL                      (WID_CHAOS_START + 159)
-#define WID_FREQUENCY                       (WID_CHAOS_START + 160)
 
 // PROP HTTP
 #define WID_HTTP_CONNECTION_LIMIT           (WID_CHAOS_START + 161)
-#define WID_HTTP_COOKIE_MANAGER             (WID_CHAOS_START + 162)
-
-// PROP Channel
-#define WID_COLUMN_NEXT_UPD                 (WID_CHAOS_START + 163)
-#define WID_CRAWL_STATUS                    (WID_CHAOS_START + 164)
-#define WID_CRAWL_LEVEL                     (WID_CHAOS_START + 165)
-#define WID_CRAWL_MODE                      (WID_CHAOS_START + 166)
-// WID_CRAWL_MAX_VOLUME shall be removed in the future!
-// --> WID_SIZE_LIMIT
-#define WID_CRAWL_MAX_VOLUME                (WID_CHAOS_START + 167)
-#define WID_CRAWL_IMAGE                     (WID_CHAOS_START + 168)
-#define WID_CRAWL_LINK_OUT                  (WID_CHAOS_START + 169)
-#define WID_NOTIFICATION_MODE               (WID_CHAOS_START + 170)
-#define WID_NOTIFICATION_ADDRESS            (WID_CHAOS_START + 171)
 
 // PROP BOXALL
 #define WID_ACCOUNT                         (WID_CHAOS_START + 172)
 
 // PROP FSYS
-#define WID_FSYS_KIND                       (WID_CHAOS_START + 173)
 #define WID_FSYS_FLAGS                      (WID_CHAOS_START + 174)
 
-// PROP FOLDER
-#define WID_VIEWDATA  /* obsolete */        (WID_CHAOS_START + 175)
-
 // PROP FSYS
 #define WID_WHO_IS_MASTER                   (WID_CHAOS_START + 176)
 
-// FUNC HTTP
-#define WID_HTTP_POST                       (WID_CHAOS_START + 177)
-
 // PROP ALL
-#define WID_SUPPORTED_FUNCS                 (WID_CHAOS_START + 178)
 #define WID_SIZE_LIMIT                      (WID_CHAOS_START + 179)
 
 // PROP FOLDER
 #define WID_MARKED_DOCUMENT_COUNT           (WID_CHAOS_START + 180)
 #define WID_FOLDER_COUNT                    (WID_CHAOS_START + 181)
 
-// PROP FSYS
-#define WID_FSYS_SHOW_HIDDEN                (WID_CHAOS_START + 182)
-
 // TRASHCAN
-#define WID_TRASHCAN_START                  (WID_CHAOS_START + 183)
-#define WID_TRASHCAN_EMPTY_TRASH            (WID_CHAOS_START + 183)
 #define WID_TRASHCAN_FLAG_AUTODELETE        (WID_CHAOS_START + 184)
 #define WID_TRASHCAN_FLAG_CONFIRMEMPTY      (WID_CHAOS_START + 185)
-#define WID_TRASHCAN_DUMMY1                 (WID_CHAOS_START + 186)
-#define WID_TRASHCAN_DUMMY2                 (WID_CHAOS_START + 187)
-#define WID_TRASHCAN_END                    (WID_CHAOS_START + 187)
 
 // TRASH
-#define WID_TRASH_START                     (WID_CHAOS_START + 188)
-#define WID_TRASH_RESTORE                   (WID_CHAOS_START + 188)
 #define WID_TRASH_ORIGIN                    (WID_CHAOS_START + 189)
-#define WID_TRASH_DUMMY2                    (WID_CHAOS_START + 190)
-#define WID_TRASH_END                       (WID_CHAOS_START + 190)
 
 // PROP ALL
 #define WID_TARGET_FRAMES                   (WID_CHAOS_START + 191)
 
-// FUNC FOLDER
-#define WID_EXPORT                          (WID_CHAOS_START + 192)
-
-// COMPONENT
-#define WID_COMPONENT_COMMAND               (WID_CHAOS_START + 193)
-#define WID_COMPONENT_MENU                  (WID_CHAOS_START + 194)
-
-// PROP Channel
-#define WID_HREF                            (WID_CHAOS_START + 195)
-
-// PROP FOLDER (VIEW)
-#define WID_VIEW_START                      (WID_CHAOS_START + 196)
-#define WID_VIEW_COLS_BEAMER                (WID_CHAOS_START + 196)
-#define WID_VIEW_COLS_FILEDLG               (WID_CHAOS_START + 197)
-#define WID_VIEW_COLS_FLDWIN                (WID_CHAOS_START + 198)
-#define WID_VIEW_MODE_FLDWIN                (WID_CHAOS_START + 199)
-#define WID_VIEW_LAYOUT_FLDWIN              (WID_CHAOS_START + 200)
-#define WID_VIEW_ICON_POS_FLDWIN            (WID_CHAOS_START + 201)
-#define WID_VIEW_SORT_BEAMER                (WID_CHAOS_START + 202)
-#define WID_VIEW_SORT_FILEDLG               (WID_CHAOS_START + 203)
-#define WID_VIEW_SORT_FLDWIN_DETAILS        (WID_CHAOS_START + 204)
-#define WID_VIEW_SORT_FLDWIN_ICON           (WID_CHAOS_START + 205)
-#define WID_VIEW_WINDOW_POS_FLDWIN          (WID_CHAOS_START + 206)
-#define WID_VIEW_END                        (WID_CHAOS_START + 206)
-
-// PROP ALL
-#define WID_IS_INVALID                      (WID_CHAOS_START + 207)
-
-// PROP Channel
-#define WID_VIEW_TIPHELP                    (WID_CHAOS_START + 208)
-#define WID_PUBLISHER_SCHEDULE              (WID_CHAOS_START + 209)
-#define WID_GETMODE                         (WID_CHAOS_START + 210)
-#define WID_READ_OFFLINE                    (WID_CHAOS_START + 211)
-
 // PROP ALL
-#define WID_ALL_START2                      (WID_CHAOS_START + 212)
-#define WID_REAL_NAME                       (WID_CHAOS_START + 212)
 #define WID_FLAG_UPDATE_ON_OPEN             (WID_CHAOS_START + 213)
-#define WID_ACTION_LIST                     (WID_CHAOS_START + 214)
-#define WID_EDIT_STRING                     (WID_CHAOS_START + 215)
-#define WID_SET_AS_DEFAULT                  (WID_CHAOS_START + 216)
-#define WID_ALL_END2                        (WID_CHAOS_START + 216)
-
-// PROP FOLDER (VIEW)
-#define WID_VIEW2_START                     (WID_CHAOS_START + 217)
-#define WID_VIEW2_FLD_PIC                   (WID_CHAOS_START + 217)
-#define WID_FLAG_EXPANDED                   (WID_CHAOS_START + 218)
-#define WID_CHILD_DEFAULTS                  (WID_CHAOS_START + 219)
-#define WID_VIEW2_END                       (WID_CHAOS_START + 219)
 
 // PROP HTTP
 #define WID_HTTP_KEEP_EXPIRED               (WID_CHAOS_START + 220)
@@ -398,64 +192,19 @@
 #define WID_HTTP_NOCACHE_LIST               (WID_CHAOS_START + 222)
 #define WID_HTTP_REFERER                    (WID_CHAOS_START + 223)
 
-// PROP FSYS
-#define WID_FSYS_START                      (WID_CHAOS_START + 224)
-#define WID_FSYS_VALUE_FOLDER               (WID_CHAOS_START + 224)
-#define WID_FSYS_SHOW_EXTENSION             (WID_CHAOS_START + 225)
-#define WID_VALUE_ADDED_MODE                (WID_CHAOS_START + 226)
-#define WID_FSYS_DUMMY3                     (WID_CHAOS_START + 227)
-#define WID_FSYS_DUMMY4                     (WID_CHAOS_START + 228)
-#define WID_FSYS_END                        (WID_CHAOS_START + 228)
-
-// FUNC HTTP
-#define WID_HTTP_GET_COOKIE                 (WID_CHAOS_START + 229)
-#define WID_HTTP_SET_COOKIE                 (WID_CHAOS_START + 230)
-
 // PROP HTTP
 #define WID_HTTP_COOKIE                     (WID_CHAOS_START + 231)
-#define WID_HTTP_DUMMY_1                    (WID_CHAOS_START + 232)
 
 //////////////////////////////////////////////////////////////////////////
 // WID's added after SO 5.0 release ( SUPD > 505 )
 //////////////////////////////////////////////////////////////////////////
 
 // PROP FOLDER
-#define WID_FOLDER_START2                   (WID_CHAOS_START + 233)
 #define WID_USER_SORT_CRITERIUM             (WID_CHAOS_START + 233)
-#define WID_HEADER_CONFIG                   (WID_CHAOS_START + 234)
-#define WID_GROUPVIEW_CONFIG                (WID_CHAOS_START + 235)
-#define WID_FLD_WEBVIEW_TEMPLATE            (WID_CHAOS_START + 236)
-// eigene Iconpositionen fuer den Explorer, da er noch
-// keinen eigenen View-Storage hat
-#define WID_VIEW_ICON_POS_GRPWIN            (WID_CHAOS_START + 237)
-#define WID_FOLDER_END2                     (WID_CHAOS_START + 237)
-
-// PROP ALL
-#define WID_SHOW_IN_EXPLORER                (WID_CHAOS_START + 238)
-
-// PROP FOLDER (VIEW)
-#define WID_VIEW3_START                     (WID_CHAOS_START + 239)
-#define WID_FLD_FONT                        (WID_CHAOS_START + 239)
-#define WID_FLD_WEBVIEW_USE_GLOBAL          (WID_CHAOS_START + 240)
-#define WID_VIEW3_DUMMY2                    (WID_CHAOS_START + 241)
-#define WID_VIEW3_DUMMY3                    (WID_CHAOS_START + 242)
-#define WID_VIEW3_END                       (WID_CHAOS_START + 242)
 
 // PROP FTP
 #define WID_FTP_ACCOUNT                     (WID_CHAOS_START + 243)
 
-// PROP FOLDER
-#define WID_STORE_MARKED                    (WID_CHAOS_START + 244)
-
-// REPLICATION ( Currently only here to have file compatibility between
-//               SO51 Client and SO51 Server, for which the functionality
-//               first shall be implemented ).
-#define WID_REPLICATION_1                   (WID_CHAOS_START + 245)
-#define WID_REPLICATION_2                   (WID_CHAOS_START + 246)
-#define WID_REPLICATION_3                   (WID_CHAOS_START + 247)
-#define WID_REPLICATION_4                   (WID_CHAOS_START + 248)
-#define WID_REPLICATION_5                   (WID_CHAOS_START + 249)
-
 // PROP SEARCH
 #define WID_SEARCH_INDIRECTIONS             (WID_CHAOS_START + 250)
 
@@ -463,10 +212,6 @@
 #define WID_SEND_FORMATS                    (WID_CHAOS_START + 251)
 #define WID_SEND_COPY_TARGET                (WID_CHAOS_START + 252)
 
-// FUNC ALL
-#define WID_TRANSFER_RESULT                 (WID_CHAOS_START + 253)
-
 // END
-#define WID_CHAOS_END                       (WID_CHAOS_START + 253)
 
 #endif /* !_CNTWIDS_HRC */
diff --git a/svl/inc/svl/memberid.hrc b/svl/inc/svl/memberid.hrc
index 7047e0d75e8f..cdcb04f45dd7 100644
--- a/svl/inc/svl/memberid.hrc
+++ b/svl/inc/svl/memberid.hrc
@@ -28,8 +28,6 @@
 #ifndef _MEMBERID_HRC
 #define _MEMBERID_HRC
 
-#define SFX_MEMBERID(nUserData) ( ( (nUserData) >> 20 ) & 0xFF )
-#define SFX_SLOTID(nUserData)   ( (nUserData) & 0xFFFF )
 
 #define MID_X       1
 #define MID_Y       2
diff --git a/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc
index d14c51e5b6c5..4fe5413b068e 100644
--- a/svl/inc/svl/solar.hrc
+++ b/svl/inc/svl/solar.hrc
@@ -112,7 +112,7 @@
 // do *NOT* add more ranges here, RID_LIB_END is (RID_LIB_START + 10000)
 
 #define RID_APP_START               20000
-#define RID_APP_END                 31999
+//      RID_APP_END                 31999
 
 #define RID_SW_START                            (20000)
 //      RID_SW_END                              (25999)
@@ -130,142 +130,47 @@
 
 #define RID_FORMULA_START                       (RID_OBJ_START+1001)
 //      RID_FORMULA_END                         (RID_OBJ_START+1200)
-// Help-Ids --------------------------------------------------------------
 
-#define HID_OK_BUTTON               0
-#define HID_CANCEL_BUTTON           0
-#define HID_HELP_BUTTON             0
+// Help-Ids --------------------------------------------------------------
 
 #define HID_START                   32768
 
 #define HID_VCL_START               (HID_START+100)
-#define HID_VCL_END                 (HID_START+150)
+//      HID_VCL_END                 (HID_START+150)
 
-#define HID_SVTOOLS_START           (HID_START+200)
-#define HID_SVTOOLS_END             (HID_START+299)
+// free: 200-299
 
 #define HID_SFX_START               (HID_START+300)
-#define HID_SFX_END                 (HID_START+999)
+//      HID_SFX_END                 (HID_START+999)
 
 #define HID_LIB_START               (HID_START+1000)
-#define HID_LIB_END                 (HID_START+19999)
-
-#define HID_SVX_START               (HID_LIB_START)
-#define HID_SVX_END                 (HID_LIB_START+431)
-
-#define HID_WIZARD_START            (HID_LIB_START+432)
-#define HID_WIZARD_END              (HID_LIB_START+999)
-//please note: There is also HID_WIZARD2 below
+//      HID_LIB_END                 (HID_START+19999)
 
-// FREE
+// free: HID_LIB_START 0-1699
 
-#define HID_CUI_START               (HID_LIB_START+1100)
-#define HID_CUI_END                 (HID_LIB_START+1699)
-
-#define HID_OFA_START               (HID_LIB_START+1760)
+//      HID_OFA_START               (HID_LIB_START+1760)
 #define HID_OFA_END                 (HID_LIB_START+1999)
 
-#define HID_HELP_START              (HID_LIB_START+2000)
-#define HID_HELP_END                (HID_LIB_START+2050)
+// free: HID_LIB_START 2000-2050
 
 #define HID_CHAOS_START             (HID_LIB_START+2051)
-#define HID_CHAOS_END               (HID_LIB_START+2069)
-
-#define HID_UUI_START               (HID_LIB_START+2070)
-#define HID_UUI_END                 (HID_LIB_START+2099)
-
-#define HID_GOODIES_START           (HID_LIB_START+2100)
-#define HID_GOODIES_END             (HID_LIB_START+2199)
-
-#define HID_EDIT_START          (HID_LIB_START+2200)
-#define HID_EDIT_END            (HID_LIB_START+3399)
-
-#define HID_CHANNEL_START           (HID_LIB_START+3400)
-#define HID_CHANNEL_END             (HID_LIB_START+3499)
-
-#define HID_SBA_START               (HID_LIB_START+ 3500)
-#define HID_SBA_END                 (HID_LIB_START+ 3999)
-
-#define HID_FORMS_START             (HID_LIB_START+4000)
-#define HID_FORMS_END               (HID_LIB_START+4999)
-
-#define HID_DBACCESS_START          (HID_LIB_START+5000)
-#define HID_DBACCESS_END            (HID_LIB_START+5299)
-
-#define HID_PORTAL_START            (HID_LIB_START+5300)
-#define HID_PORTAL_END              (HID_LIB_START+5599)
-
-#define HID_PORTAL_ADMIN_START      (HID_LIB_START+5600)
-#define HID_PORTAL_ADMIN_END        (HID_LIB_START+5999)
-
-#define HID_SYNCACCESS_START        (HID_LIB_START+6000)
-#define HID_SYNCACCESS_END          (HID_LIB_START+6099)
+//      HID_CHAOS_END               (HID_LIB_START+2069)
 
-#define HID_SVX_EXT0_START          (HID_LIB_START+6100)
-#define HID_SVX_EXT0_END            (HID_LIB_START+6599)
+// free: HID_LIB_START 2070-9999
 
-#define HID_FRAMEWORK_START         (HID_LIB_START+6600)
-#define HID_FRAMEWORK_END           (HID_LIB_START+6999)
-
-#define HID_WIZARD2_START           (HID_LIB_START+7000)
-#define HID_WIZARD2_END             (HID_LIB_START+8999)
-
-#define HID_DESKTOP_START           (HID_LIB_START+9000)
-#define HID_DESKTOP_END             (HID_LIB_START+9299)
-
-#define HID_XMLSECURITY_START       (HID_LIB_START+9300)
-#define HID_XMLSECURITY_END         (HID_LIB_START+9999)
-
-#define HID_APP_START               (HID_START+20000)
-#define HID_APP_END                 (HID_START+29999)
-
-#define HID_SW_START                (HID_START+20000)
-#define HID_SW_END                  (HID_START+24999)
+// free: HID_START 20000-24999
 
 #define HID_SC_START                (HID_START+25000)
-#define HID_SC_END                  (HID_START+26999)
+//      HID_SC_END                  (HID_START+26999)
 
 #define HID_SD_START                (HID_START+27000)
-#define HID_SD_END                  (HID_START+27999)
-
-#define HID_Sa_START                (HID_START+28000)
-#define HID_Sa_END                  (HID_START+28999)
+//      HID_SD_END                  (HID_START+27999)
 
-#define HID_Sb_START                (HID_START+29000)
-#define HID_Sb_END                  (HID_START+29999)
+// free: HID_START 28000-29999
 
 #define HID_OBJ_START               (HID_START+30000)
-#define HID_OBJ_END                 (HID_START+32767)
-
-#define HID_CUI3_START              (HID_OBJ_START+   0)
-#define HID_CUI3_END                (HID_OBJ_START+ 239)
-
-#define HID_AVMEDIA_START           (HID_OBJ_START+ 240)
-#define HID_AVMEDIA_END             (HID_OBJ_START+ 255)
-
-#define HID_SMA_START               (HID_OBJ_START+ 256)
-#define HID_SMA_END                 (HID_OBJ_START+ 511)
-
-#define HID_SCH_START               (HID_OBJ_START+ 512)
-#define HID_SCH_END                 (HID_OBJ_START+ 767)
-
-#define HID_BASICIDE_START          (HID_OBJ_START+ 768)
-#define HID_BASICIDE_END            (HID_OBJ_START+1023)
-
-#define HID_SMA2_START              (HID_OBJ_START+1024)
-#define HID_SMA2_END                (HID_OBJ_START+1280)
-
-#define HID_FILTER_START            (HID_OBJ_START+1281)
-#define HID_FILTER_END              (HID_OBJ_START+1580)
-
-#define HID_LICENSING_START         (HID_OBJ_START+1581)
-#define HID_LICENSING_END           (HID_OBJ_START+1680)
-
-#define HID_RPT_START               (HID_OBJ_START+1681)
-#define HID_RPT_END                 (HID_OBJ_START+2080)
+//      HID_OBJ_END                 (HID_START+32767)
 
-#define HID_FORMULA_START           (HID_OBJ_START+2081)
-#define HID_FORMULA_END             (HID_OBJ_START+2280)
 
 #define HID_EXTENSIONS_START        (HID_OBJ_START+2281)
 #define HID_EXTENSIONS_END          (HID_OBJ_START+2800)
@@ -273,32 +178,30 @@
 // Slot Ids
 
 #define SID_SFX_START                5000
-#define SID_SFX_END                  8999
+//      SID_SFX_END                  8999
 #define SID_DOCKWIN_START            9800
-#define SID_DOCKWIN_END              9999
+//      SID_DOCKWIN_END              9999
 
 #define SID_LIB_START               10000
-#define SID_LIB_END                 19999
-#define SID_APP_START               20000
-#define SID_APP_END                 29999
+//      SID_LIB_END                 19999
+// free: 20000-29999
 #define SID_OBJ_START               30000
 
 #define SID_SW_START                20000
-#define SID_SW_END                  25999
+//      SID_SW_END                  25999
 #define SID_SC_START                26000
-#define SID_SC_END                  26999
+//      SID_SC_END                  26999
 #define SID_SD_START                27000
-#define SID_SD_END                  27999
+//      SID_SD_END                  27999
 
-#define SID_OBJ0_START              (SID_OBJ_START +    0)
 #define SID_OBJ2_START              (SID_OBJ_START +  256)
 #define SID_OBJ1_START              (SID_OBJ_START +  512)
 #define SID_OBJ3_START              (SID_OBJ_START +  768)
 
 #define SID_SMA_START               SID_OBJ2_START
-#define SID_SMA_END                 (SID_SMA_START + 255 )
+//      SID_SMA_END                 (SID_SMA_START + 255 )
 #define SID_BASICIDE_START          (SID_OBJ3_START)
-#define SID_BASICIDE_END            (SID_BASICIDE_START + 255)
+//      SID_BASICIDE_END            (SID_BASICIDE_START + 255)
 
 #define SID_SVX_START               SID_LIB_START               // 10000
 #define SID_SVX_END                 (SID_SVX_START + 1499)
@@ -311,7 +214,7 @@
 #define SID_DBACCESS_START          (SID_SBA_END + 1)           // 12251
 #define SID_DBACCESS_END            (SID_DBACCESS_START + 200)
 #define SID_RPTUI_START             (SID_DBACCESS_END + 1)      // 12452
-#define SID_RPTUI_END               (SID_RPTUI_START + 199)
+//      SID_RPTUI_END               (SID_RPTUI_START + 199)
 
 #endif
 
diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc
index 2ac8213bb704..b40524a259fc 100644
--- a/svl/inc/svl/svl.hrc
+++ b/svl/inc/svl/svl.hrc
@@ -61,10 +61,6 @@
 #define STR_SVT_MIMETYPE_X_VRML             (STR_SVT_MIMETYPE_START+28)
 #define STR_SVT_MIMETYPE_APP_STARHELP       (STR_SVT_MIMETYPE_START+29)
 #define STR_SVT_MIMETYPE_APP_STARIMPRESS    (STR_SVT_MIMETYPE_START+30)
-#define STR_SVT_MIMETYPE_APP_SCHED_CMB      (STR_SVT_MIMETYPE_START+31)
-#define STR_SVT_MIMETYPE_APP_SCHED_EVT      (STR_SVT_MIMETYPE_START+32)
-#define STR_SVT_MIMETYPE_APP_SCHED_TASK     (STR_SVT_MIMETYPE_START+33)
-#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW    (STR_SVT_MIMETYPE_START+34)
 
 #define STR_SVT_MIMETYPE_CNT_FSYSBOX        (STR_SVT_MIMETYPE_START+35)
 #define STR_SVT_MIMETYPE_CNT_FSYSFLD        (STR_SVT_MIMETYPE_START+36)