helpers/help_hid.lst | 9 ---------
source/text/shared/explorer/database/02010101.xhp | 21 ++++++++++-----------
source/text/shared/explorer/database/05020100.xhp | 6 ++----
3 files changed, 12 insertions(+), 24 deletions(-)
New commits:
commit 02fac10d462f6c3a7a17535e8902d5cccb065d98
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Mar 13 15:11:37 2014 +0000
update help ids for join query .ui conversion
Change-Id: I2185a45d4f799bf631f78d0d35da5e9e23672cb2
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 30ab995..b8e0dc9 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1430,13 +1430,6 @@ HID_DLG_NAME,33818,
HID_DLG_NEWERVERSIONWARNING,35848,
HID_DLG_PASSWD_SECTION,53440,
HID_DLG_PASSWORD,38964,
-HID_DLG_QRY_HELPTEXT,38860,
-HID_DLG_QRY_JOIN,38855,
-HID_DLG_QRY_JOINTYPE,38856,
-HID_DLG_QRY_JOIN_CONTROL,39150,
-HID_DLG_QRY_LEFT_TABLE,38981,
-HID_DLG_QRY_RIGHT_TABLE,38982,
-HID_DLG_QRY_WINDOW_CONTROL,38980,
HID_DLG_REL_CASC_DEL,38983,
HID_DLG_REL_CASC_DEL_DEFAULT,38986,
HID_DLG_REL_CASC_DEL_NULL,38985,
@@ -2855,7 +2848,6 @@ HID_REDLINE_AUTOFMT_ACCEPT,53072,
HID_REDLINE_CTRL,53226,
HID_RELATIONDIALOG_LEFTFIELDCELL,38922,
HID_RELATIONDIALOG_RIGHTFIELDCELL,38923,
-HID_RELDLG_KEYFIELDS,38924,
HID_REPORTSECTION,64457,
HID_REPORT_NAVIGATOR_TREE,64521,
HID_RETURN_TO_MAILMERGE,54989,
@@ -5412,7 +5404,6 @@ chart2_TabPage_TP_LOCATION,551829504,
chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120,
chart2_TabPage_TP_YERRORBAR,551927808,
dbaccess_CheckBox_DLG_INDEXDESIGN_CB_UNIQUE,1388626945,
-dbaccess_CheckBox_DLG_QRY_JOIN_WND_JOIN_CONTROL_CB_NATURAL,1073759233,
dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
diff --git a/source/text/shared/explorer/database/02010101.xhp
b/source/text/shared/explorer/database/02010101.xhp
index 27686fb..b3c881e 100644
--- a/source/text/shared/explorer/database/02010101.xhp
+++ b/source/text/shared/explorer/database/02010101.xhp
@@ -40,30 +40,29 @@
<section id="howtoget">
<embed href="text/shared/00/00000450.xhp#Joins"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_QRY_LEFT_TABLE"
id="bm_id3150749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_QRY_RIGHT_TABLE"
id="bm_id3150752" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/joindialog/table1"
id="bm_id3150749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/joindialog/table2"
id="bm_id3150752" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="2" l10n="U"
oldref="17">Tables involved</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153924" role="paragraph" l10n="U"
oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables
that you want to join.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153924" role="paragraph" l10n="U"
oldref="16"><ahelp hid="dbaccess/ui/joindialog/table2">Specifies two different
tables that you want to join.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3155766" role="heading" level="2"
l10n="U"
oldref="15">Fields involved</paragraph>
<paragraph xml-lang="en-US" id="par_id3148994" role="paragraph"
l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be
joined by a relation.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3159267" role="heading" level="2"
l10n="U" oldref="3">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_QRY_JOINTYPE"
id="bm_id3147321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/joindialog/type"
id="bm_id3147321" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147340" role="heading" level="3" l10n="U"
oldref="13">Type</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152482" role="paragraph"
l10n="CHG" oldref="4"><ahelp hid="HID_DLG_QRY_JOINTYPE">Specifies the link type
of the selected link.</ahelp> Some databases support only a subset of the
possible types.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152482" role="paragraph"
l10n="CHG" oldref="4"><ahelp hid="dbaccess/ui/joindialog/type">Specifies the
link type of the selected link.</ahelp> Some databases support only a subset of
the possible types.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3155334" role="heading" level="3"
l10n="U" oldref="5">Inner Join</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155936" role="paragraph" l10n="U"
oldref="6"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the internal join, the
results table contains only the records for which the content of the linked
fields is the same.</ahelp> In $[officename] SQL this type of link is created
by a corresponding WHERE clause.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155936" role="paragraph" l10n="U"
oldref="6"><ahelp hid="dbaccess/ui/joindialog/type">With the internal join, the
results table contains only the records for which the content of the linked
fields is the same.</ahelp> In $[officename] SQL this type of link is created
by a corresponding WHERE clause.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3156372" role="heading" level="3"
l10n="U" oldref="7">Left Join</paragraph>
- <paragraph xml-lang="en-US" id="par_id3166450" role="paragraph" l10n="U"
oldref="8"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the left join, the results
table contains all fields of the left table and only those fields of the right
table for which the content of the linked fields is the same.</ahelp> In
$[officename] SQL this type of link corresponds to the LEFT OUTER JOIN
command.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166450" role="paragraph" l10n="U"
oldref="8"><ahelp hid="dbaccess/ui/joindialog/type">With the left join, the
results table contains all fields of the left table and only those fields of
the right table for which the content of the linked fields is the same.</ahelp>
In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN
command.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3155607" role="heading" level="3"
l10n="U" oldref="9">Right Join</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150647" role="paragraph" l10n="U"
oldref="10"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the right join, the results
table contains all fields of the right table and only those fields of the left
table for which the content of the linked fields is the same.</ahelp> In
$[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN
command.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150647" role="paragraph" l10n="U"
oldref="10"><ahelp hid="dbaccess/ui/joindialog/type">With the right join, the
results table contains all fields of the right table and only those fields of
the left table for which the content of the linked fields is the same.</ahelp>
In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN
command.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3158215" role="heading" level="3"
l10n="U"
oldref="11">Full Join</paragraph>
- <paragraph xml-lang="en-US" id="par_id3163665" role="paragraph" l10n="U"
oldref="12"><ahelp hid="HID_DLG_QRY_JOINTYPE">For a full join, the results
table contains all fields of the left and right tables.</ahelp> In the SQL of
$[officename] this type of link corresponds to the FULL OUTER JOIN
command.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_QRY_JOIN_CONTROL"
id="bm_id0305200912022930" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id3163665" role="paragraph" l10n="U"
oldref="12"><ahelp hid="dbaccess/ui/joindialog/type">For a full join, the
results table contains all fields of the left and right tables.</ahelp> In the
SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN
command.</paragraph>
<paragraph xml-lang="en-US" id="hd_id0305200912031976" role="heading"
level="3" l10n="NEW">Natural</paragraph>
<paragraph xml-lang="en-US" id="par_id0305200912031977" role="paragraph"
l10n="NEW"><ahelp hid=".">Inserts the keyword NATURAL into the SQL statement
that defines the relation. The relation joins all columns that have the same
column name in both tables. The resulting joined table contains only one column
for each pair of equally named columns.</ahelp></paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/shared/explorer/database/05020100.xhp
b/source/text/shared/explorer/database/05020100.xhp
index 94e9682..976b129 100644
--- a/source/text/shared/explorer/database/05020100.xhp
+++ b/source/text/shared/explorer/database/05020100.xhp
@@ -43,14 +43,12 @@
<embed href="text/shared/00/00000450.xhp#relationen"/>
</section>
<paragraph role="note" id="par_id3155136" xml-lang="en-US" l10n="U"
oldref="3">The update and delete options are only available if they are
supported by the database used.</paragraph>
-<!-- removed HID DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_LEFT_TABLE -->
-<!-- removed HID DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE -->
<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="2"
l10n="U" oldref="27">Tables</paragraph>
<paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="U"
oldref="28"><ahelp hid="DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE"
visibility="hidden">This is where the two related tables are listed.</ahelp> If
you create a new relation, you can select one table from each of the combo
boxes in the top part of the dialog.</paragraph>
<paragraph role="paragraph" id="par_id3154047" xml-lang="en-US" l10n="U"
oldref="29">If you opened the <emph>Relations</emph> dialog for an existing
relation by double-clicking the connection lines in the Relation window, then
the tables involved in the relation cannot be modified.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_RELDLG_KEYFIELDS"
id="bm_id3153716" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/joindialog/relations"
id="bm_id3153716" localize="false"/>
<paragraph role="heading" id="hd_id3153822" xml-lang="en-US" level="2"
l10n="U" oldref="4">Key fields</paragraph>
-<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U"
oldref="5"><ahelp hid="HID_RELDLG_KEYFIELDS">Defines the key fields for the
relation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U"
oldref="5"><ahelp hid="dbaccess/ui/joindialog/relations">Defines the key fields
for the relation.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL" id="bm_id3153561"
localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL" id="bm_id3153543"
localize="false"/>
<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U"
oldref="30"><ahelp hid="HID_RELATIONDIALOG_RIGHTFIELDCELL">The names of the
tables selected for the link appear here as column names.</ahelp> If you click
a field, you can use the arrow buttons to select a field from the table. Each
relation is written in a row.</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
