From 02fac10d462f6c3a7a17535e8902d5cccb065d98 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 13 Mar 2014 15:11:37 +0000 Subject: update help ids for join query .ui conversion Change-Id: I2185a45d4f799bf631f78d0d35da5e9e23672cb2 --- 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(-) diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 30ab995018..b8e0dc97ce 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 27686fbc01..b3c881e5cc 100644 --- a/source/text/shared/explorer/database/02010101.xhp +++ b/source/text/shared/explorer/database/02010101.xhp @@ -40,30 +40,29 @@
- - + + Tables involved - Specifies two different tables that you want to join. + Specifies two different tables that you want to join. Fields involved Specifies two data fields that will be joined by a relation. Options - + Type - Specifies the link type of the selected link. Some databases support only a subset of the possible types. + Specifies the link type of the selected link. Some databases support only a subset of the possible types. Inner Join - With the internal join, the results table contains only the records for which the content of the linked fields is the same. In $[officename] SQL this type of link is created by a corresponding WHERE clause. + With the internal join, the results table contains only the records for which the content of the linked fields is the same. In $[officename] SQL this type of link is created by a corresponding WHERE clause. Left Join - 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. In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command. + 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. In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command. Right Join - 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. In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command. + 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. In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command. Full Join - For a full join, the results table contains all fields of the left and right tables. In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command. - + For a full join, the results table contains all fields of the left and right tables. In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command. Natural 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. - \ No newline at end of file + diff --git a/source/text/shared/explorer/database/05020100.xhp b/source/text/shared/explorer/database/05020100.xhp index 94e96824e1..976b129bf9 100644 --- a/source/text/shared/explorer/database/05020100.xhp +++ b/source/text/shared/explorer/database/05020100.xhp @@ -43,14 +43,12 @@ The update and delete options are only available if they are supported by the database used. - - Tables This is where the two related tables are listed. If you create a new relation, you can select one table from each of the combo boxes in the top part of the dialog. If you opened the Relations 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. - + Key fields -Defines the key fields for the relation. +Defines the key fields for the relation. The names of the tables selected for the link appear here as column names. 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. -- cgit