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

[Caolán McNamara]

 helpers/help_hid.lst                              |    4 ----
 source/text/shared/explorer/database/11020000.xhp |   12 ++++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 4a999f706bc00ca36f266918cef0be8bd07333fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 29 14:10:58 2014 +0000

    update help ids for generated value .ui conversion
    
    Change-Id: Ib53fd0557421149c32e777f3fa7a8c5c7855f3d2

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e51f915..fe89e3f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1468,8 +1468,6 @@ HID_DRAW_TEXT_TOOLBOX,54835,
 HID_DRAW_TOOLBOX,54832,
 HID_DSADMIN_ALLOWLONG,38813,
 HID_DSADMIN_ALL_TABLES,38823,
-HID_DSADMIN_AUTOINCREMENTVALUE,38994,
-HID_DSADMIN_AUTORETRIEVEENABLED,38998,
 HID_DSADMIN_BOOKMARK_TOOLBOX,38941,
 HID_DSADMIN_BOOLEANCOMPARISON,39017,
 HID_DSADMIN_BROWSECONN,38809,
@@ -1527,7 +1525,6 @@ HID_DSADMIN_QUERIES_EDIT,38876,
 HID_DSADMIN_QUERIES_NEW,38875,
 HID_DSADMIN_QUERYADMINISTRATION,38878,
 HID_DSADMIN_QUERY_TOOLBOX,38940,
-HID_DSADMIN_RETRIEVE_AUTO,38997,
 HID_DSADMIN_SELECT_TABLES,38825,
 HID_DSADMIN_SHOWDELETED,38812,
 HID_DSADMIN_SPECIAL_MESSAGE,38840,
@@ -5615,7 +5612,6 @@ 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,
-dbaccess_TabPage_PAGE_GENERATED_VALUES,851804160,
 dbaccess_TabPage_PAGE_MYSQL_JDBC,851771392,
 dbaccess_TabPage_PAGE_MYSQL_NATIVE,851836928,
 dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240,
diff --git a/source/text/shared/explorer/database/11020000.xhp b/source/text/shared/explorer/database/11020000.xhp
index 449179c..d4f30b9 100644
--- a/source/text/shared/explorer/database/11020000.xhp
+++ b/source/text/shared/explorer/database/11020000.xhp
@@ -51,16 +51,16 @@
 </section>
 <section id="retrieve">
 <paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="2" l10n="U" oldref="22">General</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED" id="bm_id3161657" localize="false"/><paragraph role="heading" id="hd_id3147265" xml-lang="en-US" level="3" l10n="U" oldref="24">Retrieve generated values</paragraph>
-<paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_DSADMIN_AUTORETRIEVEENABLED">Enables $[officename] support of auto-incremented data fields for the current ODBC or JDBC data source.</ahelp> Select this check box if the database does not support the auto-increment feature in its SDBCX layer. In general, the auto-increment is selected for the primary key field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE" id="bm_id3150792" localize="false"/><paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="26">Auto-increment statement</paragraph>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_DSADMIN_AUTOINCREMENTVALUE">Enter the SQL command specifier that instructs the data source to auto-increment a specified Integer data field.</ahelp> For example, a typical SQL statement to create a data field is: </paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generatedvaluespage/autoretrieve" id="bm_id3161657" localize="false"/><paragraph role="heading" id="hd_id3147265" xml-lang="en-US" level="3" l10n="U" oldref="24">Retrieve generated values</paragraph>
+<paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="dbaccess/ui/generatedvaluespage/autoretrieve">Enables $[officename] support of auto-incremented data fields for the current ODBC or JDBC data source.</ahelp> Select this check box if the database does not support the auto-increment feature in its SDBCX layer. In general, the auto-increment is selected for the primary key field.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generatedvaluespage/statement" id="bm_id3150792" localize="false"/><paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="26">Auto-increment statement</paragraph>
+<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="dbaccess/ui/generatedvaluespage/statement">Enter the SQL command specifier that instructs the data source to auto-increment a specified Integer data field.</ahelp> For example, a typical SQL statement to create a data field is: </paragraph>
 <paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="28">CREATE TABLE "table1" ("id" INTEGER)</paragraph>
 <paragraph role="paragraph" id="par_id3147084" xml-lang="en-US" l10n="U" oldref="29">To auto-increment the "id" data field in a MySQL database, change the statement to:</paragraph>
 <paragraph role="paragraph" id="par_id3154909" xml-lang="en-US" l10n="U" oldref="30">CREATE TABLE "table1" ("id" INTEGER AUTO_INCREMENT)</paragraph>
 <paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="31">In other words, enter AUTO_INCREMENT into <emph>Auto-increment statement</emph> box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_RETRIEVE_AUTO" id="bm_id3153195" localize="false"/><paragraph role="heading" id="hd_id3149765" xml-lang="en-US" level="3" l10n="U" oldref="32">Query of generated values</paragraph>
-<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_DSADMIN_RETRIEVE_AUTO">Enter an SQL statement that returns the last auto-incremented value for the primary key data field.</ahelp> For example:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generatedvaluespage/query" id="bm_id3153195" localize="false"/><paragraph role="heading" id="hd_id3149765" xml-lang="en-US" level="3" l10n="U" oldref="32">Query of generated values</paragraph>
+<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="dbaccess/ui/generatedvaluespage/query">Enter an SQL statement that returns the last auto-incremented value for the primary key data field.</ahelp> For example:</paragraph>
 <paragraph role="paragraph" id="par_id3150769" xml-lang="en-US" l10n="U" oldref="34">SELECT LAST_INSERT_D();</paragraph>
 </section>
 <section id="sql92">