helpers/help_hid.lst | 13 ------
source/text/shared/explorer/database/11020000.xhp | 4 +-
source/text/shared/explorer/database/dabaadvpropdat.xhp | 31 ++++++++--------
3 files changed, 18 insertions(+), 30 deletions(-)
New commits:
commit 9ece25e22cb71cda3425d02941f288f56fc9e2e3
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jan 29 13:48:11 2014 +0000
update help ids for special settings .ui conversion
Change-Id: I8db05c6e3cf624628f11eed45328fbcb714fbe35
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 732788b..e51f915 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1468,18 +1468,14 @@ HID_DRAW_TEXT_TOOLBOX,54835,
HID_DRAW_TOOLBOX,54832,
HID_DSADMIN_ALLOWLONG,38813,
HID_DSADMIN_ALL_TABLES,38823,
-HID_DSADMIN_APPENDTABLEALIAS,39031,
-HID_DSADMIN_AS_BEFORE_CORRELATION_NAME,39065,
HID_DSADMIN_AUTOINCREMENTVALUE,38994,
HID_DSADMIN_AUTORETRIEVEENABLED,38998,
HID_DSADMIN_BOOKMARK_TOOLBOX,38941,
HID_DSADMIN_BOOLEANCOMPARISON,39017,
HID_DSADMIN_BROWSECONN,38809,
HID_DSADMIN_CALC_PATH,39015,
-HID_DSADMIN_CATALOG,39060,
HID_DSADMIN_CHARSET,38777,
HID_DSADMIN_CHARSET_USERDEF,39004,
-HID_DSADMIN_CHECK_REQUIRED_FIELDS,39066,
HID_DSADMIN_CONNURL_ADOPAGE,38850,
HID_DSADMIN_CREATEDATABASE,38927,
HID_DSADMIN_DBASE_INDICIES,38814,
@@ -1487,21 +1483,16 @@ HID_DSADMIN_DBASE_PATH,39007,
HID_DSADMIN_DECIMAL_SEPARATOR,38820,
HID_DSADMIN_DOCUMENTLINKS,38935,
HID_DSADMIN_DOCUMENTS,38934,
-HID_DSADMIN_DOSLINEENDS,39063,
HID_DSADMIN_DRIVERCLASS,38815,
HID_DSADMIN_DSACTIONS_DELETEDS,38804,
HID_DSADMIN_DSACTIONS_NEWDS,38803,
HID_DSADMIN_DSACTIONS_RESTOREDS,38805,
HID_DSADMIN_DSNAME,38806,
HID_DSADMIN_DSTYPE,38807,
-HID_DSADMIN_ENABLEOUTERJOIN,39052,
HID_DSADMIN_EXTENSION,38822,
HID_DSADMIN_FIELD_SEPARATOR,38818,
HID_DSADMIN_FLAT_PATH,39014,
HID_DSADMIN_HOSTNAME,39034,
-HID_DSADMIN_IGNORECURRENCY,39151,
-HID_DSADMIN_IGNOREDRIVER_PRIV,39033,
-HID_DSADMIN_IGNOREINDEXAPPENDIX,39062,
HID_DSADMIN_LDAP_BASEDN,38944,
HID_DSADMIN_LDAP_HOSTNAME,38943,
HID_DSADMIN_LDAP_PORTNUMBER,38945,
@@ -1528,7 +1519,6 @@ HID_DSADMIN_PAGE_MYSQL_ODBC,38999,
HID_DSADMIN_PAGE_ODBC,38799,
HID_DSADMIN_PAGE_TEXT,38801,
HID_DSADMIN_PAGE_USERDRIVER,39001,
-HID_DSADMIN_PARAMETERNAMESUBST,39032,
HID_DSADMIN_PORTNUMBER,39035,
HID_DSADMIN_PWDREC_ADO,38849,
HID_DSADMIN_QUERIES,38874,
@@ -1538,12 +1528,9 @@ HID_DSADMIN_QUERIES_NEW,38875,
HID_DSADMIN_QUERYADMINISTRATION,38878,
HID_DSADMIN_QUERY_TOOLBOX,38940,
HID_DSADMIN_RETRIEVE_AUTO,38997,
-HID_DSADMIN_SCHEMA,39061,
HID_DSADMIN_SELECT_TABLES,38825,
HID_DSADMIN_SHOWDELETED,38812,
HID_DSADMIN_SPECIAL_MESSAGE,38840,
-HID_DSADMIN_SQL92CHECK,38993,
-HID_DSADMIN_SUPPRESS_VERSIONCL,38827,
HID_DSADMIN_TABLE_TOOLBOX,38939,
HID_DSADMIN_TEXT_HEADER,38817,
HID_DSADMIN_TEXT_SEPARATOR,38819,
diff --git a/source/text/shared/explorer/database/11020000.xhp
b/source/text/shared/explorer/database/11020000.xhp
index f9486ac..449179c 100644
--- a/source/text/shared/explorer/database/11020000.xhp
+++ b/source/text/shared/explorer/database/11020000.xhp
@@ -64,8 +64,8 @@
<paragraph role="paragraph" id="par_id3150769" xml-lang="en-US" l10n="U"
oldref="34">SELECT LAST_INSERT_D();</paragraph>
</section>
<section id="sql92">
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SQL92CHECK"
id="bm_id3147289" localize="false"/><paragraph role="heading" id="hd_id3157892"
xml-lang="en-US" level="3" l10n="U" oldref="18">Use SQL92 naming
constraints</paragraph>
-<paragraph role="paragraph" id="par_id3153368" xml-lang="en-US" l10n="U"
oldref="19"><ahelp hid="HID_DSADMIN_SQL92CHECK">Only allows names that use
characters that conform to the SQL92 naming constraints in the data source. All
other characters are rejected.</ahelp> Each name must begin with a lower or
upper case letter, or an underline ( _ ). The remaining characters can be ASCII
letters, underlines, and numbers.</paragraph>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/usesql92" id="bm_id3147289"
localize="false"/><paragraph role="heading" id="hd_id3157892" xml-lang="en-US"
level="3" l10n="U" oldref="18">Use SQL92 naming constraints</paragraph>
+<paragraph role="paragraph" id="par_id3153368" xml-lang="en-US" l10n="U"
oldref="19"><ahelp hid="dbaccess/ui/specialsettingspage/usesql92">Only allows
names that use characters that conform to the SQL92 naming constraints in the
data source. All other characters are rejected.</ahelp> Each name must begin
with a lower or upper case letter, or an underline ( _ ). The remaining
characters can be ASCII letters, underlines, and numbers.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_USECATALOG"
id="bm_id3146148" localize="false"/><paragraph role="heading" id="hd_id3154011"
xml-lang="en-US" level="3" l10n="U" oldref="15">Use Catalog for file-based
databases</paragraph>
<paragraph role="paragraph" id="par_id3148618" xml-lang="en-US" l10n="U"
oldref="16"><ahelp hid="HID_DSADMIN_USECATALOG">Uses the current data source of
the Catalog. This is useful when the ODBC data source is a database server. If
the ODBC data source is a dBASE driver, leave this check box
clear.</ahelp></paragraph>
diff --git a/source/text/shared/explorer/database/dabaadvpropdat.xhp
b/source/text/shared/explorer/database/dabaadvpropdat.xhp
index bfc8699..5fa685a 100644
--- a/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -38,60 +38,61 @@
<paragraph xml-lang="en-US" id="par_id4572283" role="paragraph"
l10n="NEW">The availability of the following controls depends on the type of
database:</paragraph>
<paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2"
l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and
for text file folder</comment></paragraph>
<paragraph xml-lang="en-US" id="par_idN10594" role="paragraph"
l10n="NEW"><ahelp hid=".">Only allows characters that conform to the SQL92
naming convention in a name in a data source. All other characters are
rejected. Each name must begin with a lowercase letter, an uppercase letter, or
an underscore ( _ ). The remaining characters can be ASCII letters, numbers,
and underscores.</ahelp></paragraph>
- <bookmark xml-lang="en-US"
branch="hid/HID_DSADMIN_AS_BEFORE_CORRELATION_NAME" id="bm_id6617777328"
localize="false"/>
+ <bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/useas" id="bm_id6617777328"
localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105907" role="heading" level="2"
l10n="NEW">Use keyword AS before table alias names</paragraph>
<paragraph xml-lang="en-US" id="par_idN105947" role="paragraph"
l10n="NEW"><ahelp hid=".">Some databases use the keyword "AS" between a name
and its alias, while other databases use a whitespace. Enable this option to
insert AS before the
alias.</ahelp><comment>http://dba.openoffice.org/specifications/Data_Source_Property_Dialog.sxw</comment></paragraph>
- <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DOSLINEENDS"
id="bm_id6617328" localize="false"/>
+ <bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/eol" id="bm_id6617328"
localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3534958" role="heading" level="2"
l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text
file folder</comment></paragraph>
<paragraph xml-lang="en-US" id="par_id6151921" role="paragraph"
l10n="NEW"><ahelp hid=".">Select to use the CR + LF code pair to end every text
line (preferred for DOS and Windows operating systems).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_APPENDTABLEALIAS"
id="bm_id9050569" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialsettingspage/append"
id="bm_id9050569" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1059E" role="heading" level="2"
l10n="NEW">Append the table alias name in SELECT statements</paragraph>
<paragraph xml-lang="en-US" id="par_idN105A2" role="paragraph"
l10n="NEW"><ahelp hid=".">Appends the alias to the table name in SELECT
statements.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN"
id="bm_id7278664" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialsettingspage/useoj"
id="bm_id7278664" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105A5" role="heading" level="2"
l10n="NEW">Use Outer Join syntax '{OJ }'</paragraph>
<paragraph xml-lang="en-US" id="par_idN105A9" role="paragraph"
l10n="NEW"><ahelp hid=".">Use escape sequences for outer joins. The syntax for
this escape sequence is {oj outer-join}</ahelp><comment>copied from
shared\explorer\database\02010100.xhp</comment></paragraph>
<paragraph xml-lang="en-US" id="par_idN105BE" role="paragraph"
l10n="NEW">Example:</paragraph>
<paragraph xml-lang="en-US" id="par_idN105C1" role="example"
l10n="NEW">select Article.* from {oj item LEFT OUTER JOIN orders ON
item.no=orders.ANR}</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_IGNOREDRIVER_PRIV"
id="bm_id3826715" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/ignoreprivs" id="bm_id3826715"
localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105C4" role="heading" level="2"
l10n="NEW">Ignore the privileges from the database driver</paragraph>
<paragraph xml-lang="en-US" id="par_idN105C8" role="paragraph"
l10n="NEW"><ahelp hid=".">Ignores access privileges that are provided by the
database driver.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_DSADMIN_PARAMETERNAMESUBST" id="bm_id8939786"
localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/replaceparams" id="bm_id8939786"
localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105CB" role="heading" level="2"
l10n="NEW">Replace named parameters with ?</paragraph>
<paragraph xml-lang="en-US" id="par_idN105CF" role="paragraph"
l10n="NEW"><ahelp hid=".">Replaces named parameters in a data source with a
question mark (?).</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id6642353"
localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/displayver" id="bm_id6642353"
localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105D2" role="heading" level="2"
l10n="NEW">Display version columns (when available)</paragraph>
- <paragraph xml-lang="en-US" id="par_idN105D6" role="paragraph"
l10n="NEW">Some databases assign version numbers to fields to track changes to
records. The version number of a field is incremented by one each time the
contents of the field are changed. <ahelp
hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Displays the internal version number of
the record in the database table.</ahelp><comment>copied from
shared\explorer\database\11090000.xhp</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_CATALOG"
id="bm_id2444532" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_idN105D6" role="paragraph"
l10n="NEW">Some databases assign version numbers to fields to track changes to
records. The version number of a field is incremented by one each time the
contents of the field are changed. <ahelp
hid="dbaccess/ui/specialsettingspage/displayver">Displays the internal version
number of the record in the database table.</ahelp><comment>copied from
shared\explorer\database\11090000.xhp</comment></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/usecatalogname" id="bm_id2444532"
localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105FA" role="heading" level="2"
l10n="NEW">Use the catalog name in SELECT statements</paragraph>
<paragraph xml-lang="en-US" id="par_idN105FE" role="paragraph"
l10n="NEW"><ahelp hid=".">Uses the current data source of the catalog. This
option is useful when the ODBC data source is a database server. Do not select
this option if the ODBC data source is a dBASE driver.</ahelp><comment>copie
from shared\explorer\database\11020000.xhp</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SCHEMA"
id="bm_id7354655" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/useschemaname" id="bm_id7354655"
localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10613" role="heading" level="2"
l10n="NEW">Use the schema name in SELECT statements</paragraph>
<paragraph xml-lang="en-US" id="par_idN10617" role="paragraph"
l10n="NEW"><ahelp hid=".">Allows you to use the schema name in SELECT
statements.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_DSADMIN_IGNOREINDEXAPPENDIX" id="bm_id321665"
localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/createindex" id="bm_id321665"
localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1061A" role="heading" level="2"
l10n="NEW">Create index with ASC or DESC statement</paragraph>
<paragraph xml-lang="en-US" id="par_idN1061E" role="paragraph"
l10n="NEW"><ahelp hid=".">Creates an index with ASC or DESC
statements.</ahelp><comment>UFI: ???</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON"
id="bm_id5289773" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10621" role="heading" level="2"
l10n="NEW">Comparison of Boolean values</paragraph>
<paragraph xml-lang="en-US" id="par_idN10625" role="paragraph"
l10n="NEW"><ahelp hid=".">Select the type of Boolean comparison that you want
to use.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS" id="bm_id4741355"
localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/inputchecks" id="bm_id4741355"
localize="false"/>
<paragraph xml-lang="en-US" id="hd_id1101718" role="heading" level="2"
l10n="NEW">Form data input checks for required
fields<comment>i82291</comment></paragraph>
<paragraph xml-lang="en-US" id="par_id3783989" role="paragraph"
l10n="NEW"><ahelp hid=".">When you enter a new record or update an existing
record in a form, and you leave a field empty which is bound to a database
column which requires input, then you will see a message complaining about the
empty field.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id6684163" role="paragraph"
l10n="NEW">If this control box is not enabled, then the forms in the current
database will not be checked for required fields.</paragraph>
<paragraph xml-lang="en-US" id="par_id3837397" role="paragraph"
l10n="NEW">The control box is available for all data source types which support
write access to their data. The control box does not exist for spreadsheets,
text, csv, and the various read-only address books.</paragraph>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/ignorecurrency" id="bm_id4741356"
localize="false"/>
<paragraph xml-lang="en-US" id="hd_id0909200811170166" role="heading"
level="2" l10n="NEW">Ignore currency field information</paragraph>
<paragraph xml-lang="en-US" id="par_id0909200811170221" role="paragraph"
l10n="NEW"><ahelp hid=".">Only for Oracle JDBC connections. When enabled it
specifies that no column is treated as a currency field. The field type
returned from the database driver is discarded.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ESCAPE_DATETIME"
id="bm_id4743451355" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/useodbcliterals"
id="bm_id4743451355" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id040920092139524" role="heading" level="2"
l10n="NEW">Use ODBC conformant date/time literals</paragraph>
<paragraph xml-lang="en-US" id="par_id040920092139526" role="paragraph"
l10n="CHG"><ahelp hid=".">Use date/time literals that conform to ODBC
standard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_PRIMARY_KEY_SUPPORT"
id="bm_id47434523231355" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/specialsettingspage/primarykeys"
id="bm_id47434523231355" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id04092009442139524" role="heading"
level="2" l10n="NEW">Supports primary keys</paragraph>
<paragraph xml-lang="en-US" id="par_id04096620092139526" role="paragraph"
l10n="NEW"><ahelp hid=".">Enable to overrule Base's heuristics used to detect
whether the database supports primary keys.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id66841631" role="paragraph"
l10n="NEW">When connecting to a database using a generic API like ODBC, JDBC,
or ADO, Base currently applies heuristics to determine whether this database
supports primary keys. None of those APIs has dedicated support to retrieve
this information.</paragraph>
<paragraph xml-lang="en-US" id="par_id66841632" role="paragraph"
l10n="NEW">The heuristics sometimes fails. This tri-state check box by default
is set to the undetermined state, which means "apply the heuristics". If the
check box is enabled, primary key support is assumed. If the check box is
disabled, no primary key support is assumed.</paragraph>
<paragraph xml-lang="en-US" id="par_id66841633" role="paragraph"
l10n="NEW">Note that if this option is just for overruling the heuristics. If
you enable the check box for a database which actually does not support primary
keys, you will see some errors.</paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
