update help ids for NameMatching and TypeSelect

Change-Id: If7e9c8ac4206953decc14f5bca5aaccb0628871f

3 files changed, 20 insertions, 33 deletions

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a22718546b..2d5b291c82 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3045,9 +3045,6 @@ HID_TAB_ENT_REQUIRED,38898,
 HID_TAB_ENT_SCALE,38905,
 HID_TAB_ENT_TEXT_LEN,38900,
 HID_TAB_ENT_TYPE,38901,
-HID_TAB_NAMEMATCHING_COLS_ASSIGN,38917,
-HID_TAB_NAMEMATCHING_COLS_AVAIL,38916,
-HID_TAB_WIZ_TYPE_SELECT,38915,
 HID_TBXCONTROL_FILENEW,33360,
 HID_TEMPLATEDLG_DIALOG,32989,
 HID_TEMPLATEDLG_FILEVIEW,32991,
@@ -4978,10 +4975,6 @@ dbaccess_Edit_PAGE_USERDRIVER_ET_OPTIONS,851757059,
 dbaccess_FL_SEPARATOR2_PAGE_MYSQL_NATIVE,851836928,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_MYSQL_JDBC,851771392,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_ORACLE_JDBC,851886080,
-dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN,851635725,
-dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT,851635727,
-dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP,851635724,
-dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT,851635726,
 dbaccess_ListBox_DLG_ADABASSTAT_LB_DATADEVS,1388613121,
 dbaccess_ListBox_DLG_PARAMETERS_LB_ALLPARAMS,1388400129,
 dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST,851447299,
@@ -4990,25 +4983,19 @@ dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840,
 dbaccess_ModalDialog_DLG_PARAMETERS,1388396544,
 dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528,
 dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768,
-dbaccess_MultiListBox_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES,851610626,
 dbaccess_NumericField_DLG_ADABASSTAT_ET_MEMORYUSING,1388615683,
 dbaccess_NumericField_PAGE_ADABAS_NF_CACHE_SIZE,851531778,
 dbaccess_NumericField_PAGE_ADABAS_NF_DATA_INCREMENT,851531777,
 dbaccess_NumericField_PAGE_USERDRIVER_NF_PORTNUMBER,851761153,
-dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697,
 dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158,
 dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241,
 dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT,851448326,
-dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_ALL,851628560,
-dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_NONE,851628561,
-dbaccess_PushButton_TAB_WIZ_TYPE_SELECT_PB_AUTO,851612165,
 dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385,
 dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386,
 dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC,851444227,
 dbaccess_TabPage_PAGE_ADVANCED_SETTINGS_SPECIAL,851820544,
 dbaccess_TabPage_PAGE_MYSQL_NATIVE,851836928,
 dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240,
-dbaccess_TabPage_TAB_WIZ_NAME_MATCHING,851623936,
 desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859,
 desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011,
 desktop_Edit_TP_USER_ED_USER_FATHER,586123282,
diff --git a/source/text/shared/explorer/database/05030300.xhp b/source/text/shared/explorer/database/05030300.xhp
index 734d3088a6..67336bbd69 100644
--- a/source/text/shared/explorer/database/05030300.xhp
+++ b/source/text/shared/explorer/database/05030300.xhp
@@ -37,9 +37,9 @@
 <paragraph role="heading" id="hd_id3163829" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05030300.xhp" name="Type formatting">Type formatting</link></paragraph>
 <paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="2">In the data source explorer, you can copy a table by dragging and dropping the table onto the table container. The<emph> Type formatting </emph>dialog is the third window of the <emph>Copy table</emph> dialog.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES" id="bm_id3147291" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/typeselectpage/columnnames" id="bm_id3147291" localize="false"/>
 <paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="3">List box</paragraph>
-<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_MULTILISTBOX_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES">Lists the data fields that will be included in to the copied table.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="dbaccess/ui/typeselectpage/columnnames">Lists the data fields that will be included in to the copied table.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="5">Column information</paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_COLUMNNAME" id="bm_id3153311" localize="false"/>
 <paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="3" l10n="U" oldref="7">Field name</paragraph>
@@ -59,11 +59,11 @@
 <paragraph role="paragraph" id="par_id3147620" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_TAB_ENT_BOOL_DEFAULT">Select the default value for a Yes/No field.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="2" l10n="U" oldref="17">Automatic type recognition</paragraph>
 <paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="18">$[officename] can automatically recognize field contents when you copy database tables by drag and drop.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO" id="bm_id3153061" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/typeselectpage/auto" id="bm_id3153061" localize="false"/>
 <paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="3" l10n="U" oldref="19">(max.) lines</paragraph>
-<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="DBACCESS_NUMERICFIELD_TAB_WIZ_TYPE_SELECT_ET_AUTO">Enter the number of lines to use for automatic type recognition.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO" id="bm_id3148946" localize="false"/>
+<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="dbaccess/ui/typeselectpage/auto">Enter the number of lines to use for automatic type recognition.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/typeselectpage/autobutton" id="bm_id3148946" localize="false"/>
 <paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3" l10n="U" oldref="21">Auto</paragraph>
-<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_TYPE_SELECT_PB_AUTO">Enables automatic type recognition.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="dbaccess/ui/typeselectpage/autobutton">Enables automatic type recognition.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/explorer/database/05030400.xhp b/source/text/shared/explorer/database/05030400.xhp
index db37cf3680..8e96855899 100644
--- a/source/text/shared/explorer/database/05030400.xhp
+++ b/source/text/shared/explorer/database/05030400.xhp
@@ -37,25 +37,25 @@
 <paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05030400.xhp" name="Assign columns">Assign columns</link></paragraph>
 <paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="2">In the data source explorer, you can copy a table by dragging and dropping the table onto the table container. If you select the <emph>Attach data </emph>check box on the first page of the <emph>Copy table </emph>dialog, the <emph>Assign columns </emph>dialog opens as the second window. You can use this dialog to map the contents of a data field in the source table to a different data field in the destination table.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL" id="bm_id3153527" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/left" id="bm_id3153527" localize="false"/>
 <paragraph role="heading" id="hd_id3157958" xml-lang="en-US" level="2" l10n="U" oldref="4">Source table</paragraph>
-<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_TAB_NAMEMATCHING_COLS_AVAIL">Lists the data fields in the source table. To include a data field from the source table in the destination table, select the check box in front of the data field name. To map the contents of a data field in the source table to a different data field in the destination table, click the data field in the source table list, and then click the up or down arrow.</ahelp> To include all of the source data fields in the destination table, click <emph>All</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN" id="bm_id3147242" localize="false"/>
+<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="dbaccess/ui/namematchingpage/left">Lists the data fields in the source table. To include a data field from the source table in the destination table, select the check box in front of the data field name. To map the contents of a data field in the source table to a different data field in the destination table, click the data field in the source table list, and then click the up or down arrow.</ahelp> To include all of the source data fields in the destination table, click <emph>All</emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/right" id="bm_id3147242" localize="false"/>
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="6">Destination table</paragraph>
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_TAB_NAMEMATCHING_COLS_ASSIGN">Lists the possible data fields in the destination table. Only the data fields that are selected in the source table list will be included the destination table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP" id="bm_id3149516" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT" id="bm_id3155342" localize="false"/>
+<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="dbaccess/ui/namematchingpage/right">Lists the possible data fields in the destination table. Only the data fields that are selected in the source table list will be included the destination table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/up" id="bm_id3149516" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/up_right" id="bm_id3155342" localize="false"/>
 <paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="2" l10n="U" oldref="8">up</paragraph>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT">Moves the selected entry up one position in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN" id="bm_id3154307" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT" id="bm_id3153716" localize="false"/>
+<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="dbaccess/ui/namematchingpage/up_right">Moves the selected entry up one position in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/down" id="bm_id3154307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/down_right" id="bm_id3153716" localize="false"/>
 <paragraph role="heading" id="hd_id3149580" xml-lang="en-US" level="2" l10n="U" oldref="10">down</paragraph>
-<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT">Moves the selected entry down one position in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL" id="bm_id3147619" localize="false"/>
+<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="dbaccess/ui/namematchingpage/down_right">Moves the selected entry down one position in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/all" id="bm_id3147619" localize="false"/>
 <paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="12">all</paragraph>
-<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_ALL">Selects all of the data fields in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE" id="bm_id3155341" localize="false"/>
+<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="dbaccess/ui/namematchingpage/all">Selects all of the data fields in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/none" id="bm_id3155341" localize="false"/>
 <paragraph role="heading" id="hd_id3153541" xml-lang="en-US" level="2" l10n="U" oldref="14">none</paragraph>
-<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_NONE">Clears all of the check boxes in the list.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="dbaccess/ui/namematchingpage/none">Clears all of the check boxes in the list.</ahelp></paragraph>
 </body>
 </helpdocument>