[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

Tue May 13 05:38:12 PDT 2014

helpers/help_hid.lst                              |    9 ------
 source/text/shared/explorer/database/05030100.xhp |   31 +++++++++++-----------
 2 files changed, 16 insertions(+), 24 deletions(-)

New commits:
commit 43d91a4743d30b2e4c194d991c865b7c4be7616c
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Tue May 13 13:33:52 2014 +0100

    update help ids for copy table page .ui conversion
    
    Change-Id: Idc93a475b278d96753757329ab5b1c666c234630

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 03efbbf..52be570 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3166,8 +3166,6 @@ HID_TAB_PAGE_PBUSER,38949,
 HID_TAB_PAGE_PBUSERDELETE,38951,
 HID_TAB_PAGE_TBLGRANTS,38952,
 HID_TAB_PAGE_USERADMIN,38948,
-HID_TAB_WIZ_COPYTABLE,38918,
-HID_TAB_WIZ_TABLENAME_EDIT,38919,
 HID_TAB_WIZ_TYPE_SELECT,38915,
 HID_TBXCONTROL_FILENEW,33360,
 HID_TEMPLATEDLG_DIALOG,32989,
@@ -5091,8 +5089,6 @@ dbaccess_CheckBox_DLG_INDEXDESIGN_CB_UNIQUE,1388626945,
 dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
 dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
 dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
-dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN,851641349,
-dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_USEHEADERLINE,851641350,
 dbaccess_ComboBox_TP_SAVE_DBDOC_AS_ED_SAVE_AS_LOCATION,851464193,
 dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589,
 dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588,
@@ -5110,7 +5106,6 @@ dbaccess_Edit_PAGE_MYSQL_NATIVE_ET_USERNAME,851838977,
 dbaccess_Edit_PAGE_ORACLE_JDBC_ET_JDBCDRIVERCLASS,851888132,
 dbaccess_Edit_PAGE_USERDRIVER_ET_HOSTNAME,851757061,
 dbaccess_Edit_PAGE_USERDRIVER_ET_OPTIONS,851757059,
-dbaccess_Edit_TAB_WIZ_COPYTABLE_ET_KEYNAME,851642371,
 dbaccess_FL_SEPARATOR2_PAGE_MYSQL_NATIVE,851836928,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_MYSQL_JDBC,851771392,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_ORACLE_JDBC,851886080,
@@ -5154,10 +5149,6 @@ dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385,
 dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386,
 dbaccess_RadioButton_PAGE_DBWIZARD_MYSQL_INTRO_RB_CONNECTVIANATIVE,852197893,
 dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC,851444227,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_APPENDDATA,851640836,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_DEF,851640834,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_DEFDATA,851640833,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_VIEW,851640835,
 dbaccess_TabPage_PAGE_ADVANCED_SETTINGS_SPECIAL,851820544,
 dbaccess_TabPage_PAGE_CONNECTION,851542016,
 dbaccess_TabPage_PAGE_DBWIZARD_MYSQL_INTRO,852197376,
diff --git a/source/text/shared/explorer/database/05030100.xhp b/source/text/shared/explorer/database/05030100.xhp
index df18fbf..d58c2fc 100644
--- a/source/text/shared/explorer/database/05030100.xhp
+++ b/source/text/shared/explorer/database/05030100.xhp
@@ -30,30 +30,31 @@
 </meta>
 <body>
 <section id="tabkop">
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/copytablepage/CopyTablePage" id="bm_id3154841" localize="false"/>
 <paragraph role="heading" id="hd_id3085157" xml-lang="en-US" level="1" l10n="U" oldref="28"><link href="text/shared/explorer/database/05030100.xhp" name="Copy Table">Copy Table</link></paragraph>
 <paragraph role="paragraph" id="par_id3149264" xml-lang="en-US" l10n="CHG" oldref="29">You can copy a table by dragging and dropping the table onto the table area of a database file window. The <emph>Copy table </emph>dialog appears.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="3">Table name</paragraph>
-<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_TAB_WIZ_TABLENAME_EDIT">Specifies a name for the copy.</ahelp> Some databases only accept names containing eight or fewer characters.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/copytablepage/name" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="3">Table name</paragraph>
+<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="dbaccess/ui/copytablepage/name">Specifies a name for the copy.</ahelp> Some databases only accept names containing eight or fewer characters.</paragraph>
 <paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="2" l10n="U" oldref="5">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA" id="bm_id3147576" localize="false"/><paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="3" l10n="U" oldref="7">Definition and data</paragraph>
-<paragraph role="paragraph" id="par_id3150178" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEFDATA">Creates a 1:1 copy of the database table.</ahelp> The table definition and the complete data are copied. The table definition includes the table structure and format from different data fields, including special field properties. The field contents supply the data.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="9">Definition</paragraph>
-<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEF">Copies only the table definition and not the corresponding data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="22">As table view</paragraph>
-<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_VIEW">If the database supports Views, you can select this option only when a query is copied in a table container. This option enables you to see and edit a query as a normal table view.</ahelp> The table will be filtered in the view with a "Select" SQL statement.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Append data<comment>see #i63815</comment></paragraph>
-<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA">Appends the data of the table to be copied to an existing table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/copytablepage/defdata" id="bm_id3147576" localize="false"/><paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="3" l10n="U" oldref="7">Definition and data</paragraph>
+<paragraph role="paragraph" id="par_id3150178" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="dbaccess/ui/copytablepage/defdata">Creates a 1:1 copy of the database table.</ahelp> The table definition and the complete data are copied. The table definition includes the table structure and format from different data fields, including special field properties. The field contents supply the data.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/copytablepage/def" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="9">Definition</paragraph>
+<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="dbaccess/ui/copytablepage/def">Copies only the table definition and not the corresponding data.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/copytablepage/view" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="22">As table view</paragraph>
+<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="dbaccess/ui/copytablepage/view">If the database supports Views, you can select this option only when a query is copied in a table container. This option enables you to see and edit a query as a normal table view.</ahelp> The table will be filtered in the view with a "Select" SQL statement.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/copytablepage/data" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Append data<comment>see #i63815</comment></paragraph>
+<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="dbaccess/ui/copytablepage/data">Appends the data of the table to be copied to an existing table.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="13">The table definition must be exactly the same so that data can be copied. Data cannot be copied if a data field in the target table has another format than the data field in the source table.</paragraph>
 <paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="31">Match the data field names in the<emph> Copy Table</emph> dialog on the <link href="text/shared/explorer/database/05030400.xhp" name="Apply Columns">Apply Columns</link> page.</paragraph>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA">If the data cannot be attached, you will see a list of fields in the <emph>Column Info</emph> dialog whose data cannot be copied.</ahelp> If you confirm this dialog with OK, only the data that does not appear in the list will be attached.</paragraph>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="dbaccess/ui/copytablepage/data">If the data cannot be attached, you will see a list of fields in the <emph>Column Info</emph> dialog whose data cannot be copied.</ahelp> If you confirm this dialog with OK, only the data that does not appear in the list will be attached.</paragraph>
 <paragraph role="note" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="15">If the fields of the target table have a smaller field length than in the source table when data is being attached, the source data fields will automatically be truncated to match the field lengths in the target table.</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149164"><bookmark_value>primary keys; defining</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN">Automatically generates a primary key data field and fills it with values.</ahelp> You should always use this field, since a primary key must always be available in order to edit the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
-<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME">Specifies a name for the primary key generated. This name is optional.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/copytablepage/primarykey" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
+<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="dbaccess/ui/copytablepage/primarykey">Automatically generates a primary key data field and fills it with values.</ahelp> You should always use this field, since a primary key must always be available in order to edit the table.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/copytablepage/keyname" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
+<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="dbaccess/ui/copytablepage/keyname">Specifies a name for the primary key generated. This name is optional.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/explorer/database/05030200.xhp" name="Next page">Next page</link></paragraph>
 </body>
 </helpdocument>
