CWS changehid: #i111874#: change code to support HelpIds as byte strings

1 files changed, 30 insertions, 39 deletions

diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index 2619c4398881..1dfae71768b3 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -30,49 +30,40 @@
 
 #include "svl/solar.hrc"
 
-#define HID_GLOBAL_FALLBACK                         0xFFFFFFFF
+#define HID_PACKAGE_MANAGER                                "DESKTOP_HID_PACKAGE_MANAGER"
+#define HID_PACKAGE_MANAGER_TREELISTBOX                    "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX"
+#define HID_PACKAGE_MANAGER_PROGRESS                       "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS"
+#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL                "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL"
+#define HID_PACKAGE_MANAGER_MENU_ITEM                      "DESKTOP_HID_PACKAGE_MANAGER_MENU_ITEM"
 
-#define HID_PACKAGE_MANAGER                         (HID_DESKTOP_START +   0)
-#define HID_PACKAGE_MANAGER_TREELISTBOX             (HID_DESKTOP_START +   1)
-#define HID_PACKAGE_MANAGER_PROGRESS                (HID_DESKTOP_START +   2)
-#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL         (HID_DESKTOP_START +   3)
-#define HID_PACKAGE_MANAGER_MENU_ITEM               (HID_DESKTOP_START +   4)
+#define HID_FIRSTSTART_DIALOG                              "DESKTOP_HID_FIRSTSTART_DIALOG"
+#define HID_FIRSTSTART_WELCOME                             "DESKTOP_HID_FIRSTSTART_WELCOME"
+#define HID_FIRSTSTART_LICENSE                             "DESKTOP_HID_FIRSTSTART_LICENSE"
+#define HID_FIRSTSTART_MIGRATION                           "DESKTOP_HID_FIRSTSTART_MIGRATION"
+#define HID_FIRSTSTART_REGISTRATION                        "DESKTOP_HID_FIRSTSTART_REGISTRATION"
+#define HID_FIRSTSTART_USER                                "DESKTOP_HID_FIRSTSTART_USER"
+#define HID_FIRSTSTART_PREV                                "DESKTOP_HID_FIRSTSTART_PREV"
+#define HID_FIRSTSTART_NEXT                                "DESKTOP_HID_FIRSTSTART_NEXT"
+#define HID_FIRSTSTART_CANCEL                              "DESKTOP_HID_FIRSTSTART_CANCEL"
+#define HID_FIRSTSTART_FINISH                              "DESKTOP_HID_FIRSTSTART_FINISH"
+#define UID_FIRSTSTART_HELP                                "DESKTOP_UID_FIRSTSTART_HELP"
+#define UID_BTN_LICENSE_ACCEPT                             "DESKTOP_UID_BTN_LICENSE_ACCEPT"
+#define HID_FIRSTSTART_UPDATE_CHECK                        "DESKTOP_HID_FIRSTSTART_UPDATE_CHECK"
+#define HID_DEPLOYMENT_GUI_UPDATE                          "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE"
+#define HID_DEPLOYMENT_GUI_UPDATEINSTALL                   "DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL"
+#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER                "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER"
+#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES             "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES"
+#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES        "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES"
 
-#define HID_FIRSTSTART_DIALOG                       (HID_DESKTOP_START +   5)
-#define HID_FIRSTSTART_WELCOME                      (HID_DESKTOP_START +   6)
-#define HID_FIRSTSTART_LICENSE                      (HID_DESKTOP_START +   7)
-#define HID_FIRSTSTART_MIGRATION                    (HID_DESKTOP_START +   8)
-#define HID_FIRSTSTART_REGISTRATION                 (HID_DESKTOP_START +   9)
-#define HID_FIRSTSTART_USER                         (HID_DESKTOP_START +  10)
-#define HID_FIRSTSTART_PREV                         (HID_DESKTOP_START +  11)
-#define HID_FIRSTSTART_NEXT                         (HID_DESKTOP_START +  12)
-#define HID_FIRSTSTART_CANCEL                       (HID_DESKTOP_START +  13)
-#define HID_FIRSTSTART_FINISH                       (HID_DESKTOP_START +  14)
-#define UID_FIRSTSTART_HELP                         (HID_DESKTOP_START +  15)
-#define UID_BTN_LICENSE_ACCEPT                      (HID_DESKTOP_START +  16)
-#define HID_FIRSTSTART_UPDATE_CHECK                 (HID_DESKTOP_START +  17)
-#define HID_DEPLOYMENT_GUI_UPDATE                   (HID_DESKTOP_START +  18)
-#define HID_DEPLOYMENT_GUI_UPDATEINSTALL            (HID_DESKTOP_START +  19)
-#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER         (HID_DESKTOP_START +  20)
-#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES      (HID_DESKTOP_START +  21)
-#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES (HID_DESKTOP_START +  22)
+#define HID_EXTENSION_MANAGER_LISTBOX                      "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX"
+#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS              "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS"
+#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE               "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE"
+#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE              "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE"
+#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE               "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE"
 
-#define HID_EXTENSION_MANAGER_LISTBOX               (HID_DESKTOP_START +  23)
-#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS       (HID_DESKTOP_START +  24)
-#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE        (HID_DESKTOP_START +  25)
-#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE       (HID_DESKTOP_START +  26)
-#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE        (HID_DESKTOP_START +  27)
+#define HID_EXTENSION_DEPENDENCIES                         "DESKTOP_HID_EXTENSION_DEPENDENCIES"
 
-#define HID_EXTENSION_DEPENDENCIES                  (HID_DESKTOP_START +  28)
-
-#define HID_PACKAGE_MANAGER_UPD_REQ                 (HID_DESKTOP_START +  29)
-
-#define ACT_DESKTOP_HID_END HID_PACKAGE_MANAGER_UPD_REQ
-
-// check bounds:
-#if ACT_DESKTOP_HID_END > HID_DESKTOP_END
-#error Resource overflow in #line, #file
-#endif
+#define HID_PACKAGE_MANAGER_UPD_REQ                        "DESKTOP_HID_PACKAGE_MANAGER_UPD_REQ"
 
 #endif