CWS-TOOLING: integrate CWS dba33a

2 files changed, 67 insertions, 105 deletions

diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index c7f172cbe5db..b5089d663c72 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -33,106 +33,75 @@
 // include     -----------------------------------------------------------
 #include <svtools/solar.hrc>
 
-// in solar.hrc
-//#define HID_FORMS_START               (HID_LIB_START+4000)
-//#define HID_FORMS_END                 (HID_LIB_START+4999)
-
 // Help-Ids --------------------------------------------------------------
 
-// insgesamt 200
-#define HID_DLG_DBINFO                          (HID_FORMS_START +   0)
-#define HID_DLG_DBMSG                           (HID_FORMS_START +   1)
-
-#define HID_FM_OTHER_START                      (HID_FORMS_START + 300)
-#define HID_FORM_NAVIGATOR                      (HID_FM_OTHER_START +  0)
-#define HID_FORM_NAVIGATOR_WIN                  (HID_FM_OTHER_START +  1)
-#define HID_FIELD_SEL                           (HID_FM_OTHER_START +  2)
-#define HID_FIELD_SEL_WIN                       (HID_FM_OTHER_START +  3)
-#define HID_FILTER_NAVIGATOR                    (HID_FM_OTHER_START +  4)
-#define HID_FILTER_NAVIGATOR_WIN                (HID_FM_OTHER_START +  5)
-
-#define HID_FORM_DLG_START                      (HID_FORMS_START + 400)
-// FREE
-// FREE
-// FREE
-#define HID_FM_PROPDLG_WINDOW                   (HID_FORM_DLG_START +   3)
-#define HID_FM_PROPDLG_CONTAINER                (HID_FORM_DLG_START +   4)
-#define HID_FM_PROPDLG_TABCTR                   (HID_FORM_DLG_START +   5)
-#define HID_FM_PROPDLG_TAB_GENERAL              (HID_FORM_DLG_START +   6)
-#define HID_FM_PROPDLG_TAB_DATA                 (HID_FORM_DLG_START +   7)
-#define HID_FM_PROPDLG_TAB_EVT                  (HID_FORM_DLG_START +   8)
-#define HID_FM_DLG_SEARCH                       (HID_FORM_DLG_START +   9)
-
-#define HID_SEARCH_TEXT                         (HID_FORM_DLG_START +  10)
-#define HID_SEARCH_ALLFIELDS                    (HID_FORM_DLG_START +  11)
-#define HID_SEARCH_SINGLEFIELD                  (HID_FORM_DLG_START +  12)
-#define HID_SEARCH_FIELDSELECTION               (HID_FORM_DLG_START +  13)
-#define HID_SEARCH_POSITION                     (HID_FORM_DLG_START +  14)
-#define HID_SEARCH_FORMATTER                    (HID_FORM_DLG_START +  15)
-#define HID_SEARCH_CASE                         (HID_FORM_DLG_START +  16)
-#define HID_SEARCH_BACKWARD                     (HID_FORM_DLG_START +  17)
-#define HID_SEARCH_STARTOVER                    (HID_FORM_DLG_START +  18)
-#define HID_SEARCH_WILDCARD                     (HID_FORM_DLG_START +  19)
-#define HID_SEARCH_REGULAR                      (HID_FORM_DLG_START +  20)
-#define HID_SEARCH_APPROX                       (HID_FORM_DLG_START +  21)
-#define HID_SEARCH_APPROXSETTINGS               (HID_FORM_DLG_START +  22)
-#define HID_SEARCH_BTN_SEARCH                   (HID_FORM_DLG_START +  23)
-#define HID_SEARCH_BTN_CLOSE                    (HID_FORM_DLG_START +  24)
-
-#define HID_TABORDER_CONTROLS                   (HID_FORM_DLG_START +  25)
-
-#define HID_CONTROLS_DATE_N_TIME                (HID_FORM_DLG_START +  26)
-#define HID_FM_DLG_PARAM                        (HID_FORM_DLG_START +  27)
-
-#define HID_GRID_TRAVEL_FIRST                   (HID_FORM_DLG_START +  28)
-#define HID_GRID_TRAVEL_PREV                    (HID_FORM_DLG_START +  29)
-#define HID_GRID_TRAVEL_NEXT                    (HID_FORM_DLG_START +  30)
-#define HID_GRID_TRAVEL_LAST                    (HID_FORM_DLG_START +  31)
-#define HID_GRID_TRAVEL_NEW                     (HID_FORM_DLG_START +  32)
-#define HID_GRID_TRAVEL_ABSOLUTE                (HID_FORM_DLG_START +  33)
-#define HID_GRID_NUMBEROFRECORDS                (HID_FORM_DLG_START +  34)
-
-#define UID_SEARCH_RECORDSTATUS                 (HID_FORM_DLG_START +  35)
-
-#define UID_FORMPROPBROWSER_FRAME               (HID_FORM_DLG_START +  37)
-#define UID_ABSOLUTE_RECORD_WINDOW              (HID_FORM_DLG_START +  38)
-
-#define HID_DATA_NAVIGATOR_WIN                  (HID_FM_OTHER_START +  39)
-#define HID_XFORMS_ADDDATAITEM_DLG              (HID_FM_OTHER_START +  40)
-#define HID_XFORMS_ADDCONDITION_DLG             (HID_FM_OTHER_START +  41)
-#define HID_XFORMS_NAMESPACEITEM_DLG            (HID_FM_OTHER_START +  42)
-#define HID_XFORMS_NAMESPACEITEM_LIST           (HID_FM_OTHER_START +  43)
-#define HID_XFORMS_MANAGENAMESPACE_DLG          (HID_FM_OTHER_START +  44)
-
-#define HID_TP_XFORMS_INSTANCE                  (HID_FM_OTHER_START +  45)
-#define HID_TP_XFORMS_SUBMISSION                (HID_FM_OTHER_START +  46)
-#define HID_TP_XFORMS_BINDING                   (HID_FM_OTHER_START +  47)
-
-#define HID_MN_XFORMS_MODELS_ADD                (HID_FM_OTHER_START +  48)
-#define HID_MN_XFORMS_MODELS_EDIT               (HID_FM_OTHER_START +  49)
-#define HID_MN_XFORMS_MODELS_REMOVE             (HID_FM_OTHER_START +  50)
-#define HID_MN_XFORMS_INSTANCES_ADD             (HID_FM_OTHER_START +  51)
-#define HID_MN_XFORMS_INSTANCES_EDIT            (HID_FM_OTHER_START +  52)
-#define HID_MN_XFORMS_INSTANCES_REMOVE          (HID_FM_OTHER_START +  53)
-#define HID_MN_XFORMS_SHOW_DETAILS              (HID_FM_OTHER_START +  54)
-#define HID_XFORMS_TOOLBOX                      (HID_FM_OTHER_START +  55)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD             (HID_FM_OTHER_START +  56)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT     (HID_FM_OTHER_START +  57)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE   (HID_FM_OTHER_START +  58)
-#define HID_XFORMS_TOOLBOX_ITEM_EDIT            (HID_FM_OTHER_START +  59)
-#define HID_XFORMS_TOOLBOX_ITEM_REMOVE          (HID_FM_OTHER_START +  60)
-#define HID_XFORMS_ITEMS_LIST                   (HID_FM_OTHER_START +  61)
-#define HID_XFORMS_MODELS_LIST                  (HID_FM_OTHER_START +  62)
-#define HID_XFORMS_MODELS_MENUBTN               (HID_FM_OTHER_START +  63)
-#define HID_XFORMS_INSTANCES_MENUBTN            (HID_FM_OTHER_START +  64)
-#define HID_XFORMS_ADDSUBMISSION_DLG            (HID_FM_OTHER_START +  65)
-#define HID_XFORMS_ADDMODEL_DLG                 (HID_FM_OTHER_START +  66)
-#define HID_XFORMS_ADDINSTANCE_DLG              (HID_FM_OTHER_START +  67)
-#define HID_XFORMS_MID_INSERT_CONTROL           (HID_FM_OTHER_START +  68)
-#define HID_XFORMS_TAB_CONTROL                  (HID_FM_OTHER_START +  69)
-
-// if you add a new define here, please adjust the overflow check
-// at the end of the file!!
+#define HID_DLG_DBMSG                           ( HID_FORMS_START +   1)
+#define HID_FORM_NAVIGATOR                      ( HID_FORMS_START +   2)
+#define HID_FORM_NAVIGATOR_WIN                  ( HID_FORMS_START +   3)
+#define HID_FIELD_SEL                           ( HID_FORMS_START +   4)
+#define HID_FIELD_SEL_WIN                       ( HID_FORMS_START +   5)
+#define HID_FILTER_NAVIGATOR                    ( HID_FORMS_START +   6)
+#define HID_FILTER_NAVIGATOR_WIN                ( HID_FORMS_START +   7)
+#define HID_FM_DLG_SEARCH                       ( HID_FORMS_START +   8)
+#define HID_SEARCH_TEXT                         ( HID_FORMS_START +   9)
+#define HID_SEARCH_ALLFIELDS                    ( HID_FORMS_START +  10)
+#define HID_SEARCH_SINGLEFIELD                  ( HID_FORMS_START +  11)
+#define HID_SEARCH_FIELDSELECTION               ( HID_FORMS_START +  12)
+#define HID_SEARCH_POSITION                     ( HID_FORMS_START +  13)
+#define HID_SEARCH_FORMATTER                    ( HID_FORMS_START +  14)
+#define HID_SEARCH_CASE                         ( HID_FORMS_START +  15)
+#define HID_SEARCH_BACKWARD                     ( HID_FORMS_START +  16)
+#define HID_SEARCH_STARTOVER                    ( HID_FORMS_START +  17)
+#define HID_SEARCH_WILDCARD                     ( HID_FORMS_START +  18)
+#define HID_SEARCH_REGULAR                      ( HID_FORMS_START +  19)
+#define HID_SEARCH_APPROX                       ( HID_FORMS_START +  20)
+#define HID_SEARCH_APPROXSETTINGS               ( HID_FORMS_START +  21)
+#define HID_SEARCH_BTN_SEARCH                   ( HID_FORMS_START +  22)
+#define HID_SEARCH_BTN_CLOSE                    ( HID_FORMS_START +  23)
+#define HID_CONTROLS_DATE_N_TIME                ( HID_FORMS_START +  24)
+#define HID_GRID_TRAVEL_FIRST                   ( HID_FORMS_START +  25)
+#define HID_GRID_TRAVEL_PREV                    ( HID_FORMS_START +  26)
+#define HID_GRID_TRAVEL_NEXT                    ( HID_FORMS_START +  27)
+#define HID_GRID_TRAVEL_LAST                    ( HID_FORMS_START +  28)
+#define HID_GRID_TRAVEL_NEW                     ( HID_FORMS_START +  29)
+#define HID_GRID_TRAVEL_ABSOLUTE                ( HID_FORMS_START +  30)
+#define HID_GRID_NUMBEROFRECORDS                ( HID_FORMS_START +  31)
+#define UID_SEARCH_RECORDSTATUS                 ( HID_FORMS_START +  32)
+#define UID_FORMPROPBROWSER_FRAME               ( HID_FORMS_START +  33)
+#define UID_ABSOLUTE_RECORD_WINDOW              ( HID_FORMS_START +  34)
+#define HID_DATA_NAVIGATOR_WIN                  ( HID_FORMS_START +  35)
+#define HID_XFORMS_ADDDATAITEM_DLG              ( HID_FORMS_START +  36)
+#define HID_XFORMS_ADDCONDITION_DLG             ( HID_FORMS_START +  37)
+#define HID_XFORMS_NAMESPACEITEM_DLG            ( HID_FORMS_START +  38)
+#define HID_XFORMS_NAMESPACEITEM_LIST           ( HID_FORMS_START +  39)
+#define HID_XFORMS_MANAGENAMESPACE_DLG          ( HID_FORMS_START +  40)
+#define HID_TP_XFORMS_INSTANCE                  ( HID_FORMS_START +  41)
+#define HID_TP_XFORMS_SUBMISSION                ( HID_FORMS_START +  42)
+#define HID_TP_XFORMS_BINDING                   ( HID_FORMS_START +  43)
+#define HID_MN_XFORMS_MODELS_ADD                ( HID_FORMS_START +  44)
+#define HID_MN_XFORMS_MODELS_EDIT               ( HID_FORMS_START +  45)
+#define HID_MN_XFORMS_MODELS_REMOVE             ( HID_FORMS_START +  46)
+#define HID_MN_XFORMS_INSTANCES_ADD             ( HID_FORMS_START +  47)
+#define HID_MN_XFORMS_INSTANCES_EDIT            ( HID_FORMS_START +  48)
+#define HID_MN_XFORMS_INSTANCES_REMOVE          ( HID_FORMS_START +  49)
+#define HID_MN_XFORMS_SHOW_DETAILS              ( HID_FORMS_START +  50)
+#define HID_XFORMS_TOOLBOX                      ( HID_FORMS_START +  51)
+#define HID_XFORMS_TOOLBOX_ITEM_ADD             ( HID_FORMS_START +  52)
+#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT     ( HID_FORMS_START +  53)
+#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE   ( HID_FORMS_START +  54)
+#define HID_XFORMS_TOOLBOX_ITEM_EDIT            ( HID_FORMS_START +  55)
+#define HID_XFORMS_TOOLBOX_ITEM_REMOVE          ( HID_FORMS_START +  56)
+#define HID_XFORMS_ITEMS_LIST                   ( HID_FORMS_START +  57)
+#define HID_XFORMS_MODELS_LIST                  ( HID_FORMS_START +  58)
+#define HID_XFORMS_MODELS_MENUBTN               ( HID_FORMS_START +  59)
+#define HID_XFORMS_INSTANCES_MENUBTN            ( HID_FORMS_START +  60)
+#define HID_XFORMS_ADDSUBMISSION_DLG            ( HID_FORMS_START +  61)
+#define HID_XFORMS_ADDMODEL_DLG                 ( HID_FORMS_START +  62)
+#define HID_XFORMS_ADDINSTANCE_DLG              ( HID_FORMS_START +  63)
+#define HID_XFORMS_MID_INSERT_CONTROL           ( HID_FORMS_START +  64)
+#define HID_XFORMS_TAB_CONTROL                  ( HID_FORMS_START +  65)
+    // if you add a new define here, please adjust the overflow check
+    // at the end of the file!!
 
 
 // -----------------------------------------------------------------------
diff --git a/svx/util/hidother.src b/svx/util/hidother.src
index 6ef00e2640a2..9f1a665b4061 100644
--- a/svx/util/hidother.src
+++ b/svx/util/hidother.src
@@ -71,11 +71,6 @@ hidspecial HID_FIELD_SEL_WIN                { HelpID =HID_FIELD_SEL_WIN
 hidspecial HID_FILTER_NAVIGATOR             { HelpID =HID_FILTER_NAVIGATOR      ;};
 hidspecial HID_FILTER_NAVIGATOR_WIN         { HelpID =HID_FILTER_NAVIGATOR_WIN  ;};
 
-hidspecial HID_FM_PROPDLG_TABCTR            { HelpID =HID_FM_PROPDLG_TABCTR     ;};
-hidspecial HID_FM_PROPDLG_TAB_GENERAL       { HelpID =HID_FM_PROPDLG_TAB_GENERAL;};
-hidspecial HID_FM_PROPDLG_TAB_DATA          { HelpID =HID_FM_PROPDLG_TAB_DATA   ;};
-hidspecial HID_FM_PROPDLG_TAB_EVT           { HelpID =HID_FM_PROPDLG_TAB_EVT    ;};
-
 hidspecial HID_VALUESET_SINGLENUM           { HelpID = HID_VALUESET_SINGLENUM ;};
 hidspecial HID_VALUESET_BULLET              { HelpID = HID_VALUESET_BULLET   ;};
 hidspecial HID_VALUESET_NUM                 { HelpID = HID_VALUESET_NUM      ;};
@@ -88,8 +83,6 @@ hidspecial HID_TPPAGE_FULLSIZE              { HelpId = HID_TPPAGE_FULLSIZE
 hidspecial HID_OPTINET2_CTL_COOKIES         { HelpId = HID_OPTINET2_CTL_COOKIES ;};
 hidspecial HID_OPTPATH_CTL_PATH             { HelpId = HID_OPTPATH_CTL_PATH     ;};
 
-hidspecial HID_TABORDER_CONTROLS            { HelpId = HID_TABORDER_CONTROLS    ;};
-
 hidspecial HID_POPUP_LINEEND                { HelpId = HID_POPUP_LINEEND            ;};
 hidspecial HID_POPUP_LINEEND_CTRL           { HelpId = HID_POPUP_LINEEND_CTRL       ;};