INTEGRATION: CWS hc680postbeta (1.2.2); FILE MERGED

2005/01/18 15:19:21 fpe 1.2.2.2: regular update
2005/01/18 12:42:52 fpe 1.2.2.1: Regular Update

1 files changed, 8 insertions, 8 deletions

diff --git a/helpcontent2/source/text/shared/02/01170203.xhp b/helpcontent2/source/text/shared/02/01170203.xhp
index 6542b77708..4fec161450 100644
--- a/helpcontent2/source/text/shared/02/01170203.xhp
+++ b/helpcontent2/source/text/shared/02/01170203.xhp
@@ -37,8 +37,8 @@
  *  License at http://www.openoffice.org/license.html.
  *
  *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
  *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
  *  See the License for the specific provisions governing your rights and
  *  obligations concerning the Software.
@@ -62,7 +62,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-12T13:21:25">UFI: fixed #i25661#
+<lastedited date="2005-01-18T14:24:29">UFI: fixed #i25661#
 YJ: checked</lastedited>
 </history>
 </meta>
@@ -78,7 +78,6 @@ YJ: checked</lastedited>
 </section>
 <paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="107">Defines the data source on which the form is based, or specifies whether the data can be edited by the user. Apart from the sort and filter functions, you will also find all the necessary properties to create a <link href="text/shared/02/01170203.xhp" name="subform">subform</link>.</paragraph>
 <paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00040501.xhp#formulareigenschaftendaten"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
-<paragraph role="note" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="80">If the form is based on an SQL statement (see <emph>Data source</emph> property), the filter and sort functions are available only if the SQL statement refers to a table and is not written in the database's native SQL.</paragraph>
 <sort>
 <section id="Section1">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_DATASOURCE" id="bm_id3153146" localize="false"/>
@@ -90,13 +89,12 @@ YJ: checked</lastedited>
 <paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="2" l10n="U" oldref="6">Data source</paragraph>
 <paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_PROP_CURSORSOURCE">Determines the data source to be used for the form. The data source can be an existing table or a query (previously created in the database), or it can be defined by an SQL-statement. Before you enter a data source you have to define the exact type in <emph>Content type</emph>.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149657" xml-lang="en-US" l10n="U" oldref="27">If you have selected either "Table" or "Query" in <emph>Content type</emph>, the box lists all the data sources of this type, that is, all tables and queries set up in the selected database. If you want the form to refer to a query, you first have to select the option "Query" as data source content type.</paragraph>
-<paragraph role="paragraph" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="28">You can also enter an SQL-statement in the <emph>Data source</emph> box, if you have selected the "SQL" option as the data source content type. This statement is used to create an SQL query, which is used as a basis for generating the form or for defining a <link href="text/shared/02/01170203.xhp" name="subform">subform</link>.</paragraph>
 </section>
 <section id="Section3">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_CURSORSOURCETYPE" id="bm_id3153381" localize="false"/>
 <paragraph role="heading" id="hd_id3148755" xml-lang="en-US" level="2" l10n="U" oldref="7">Content type</paragraph>
 <paragraph role="paragraph" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_PROP_CURSORSOURCETYPE">Defines whether the data source is to be an existing database table or query, or if the form is to be generated based on an SQL statement.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="29">If you choose "Table" or "Query", the form will refer to the table or query that you specify under <emph>Data source</emph>. If you want to create a new query or a <link href="text/shared/02/01170203.xhp" name="subform">subform</link>, then you have to choose the "SQL" option. You can then enter the statement for the SQL query or the subform directly in the <emph>Data source</emph> box. The form is then generated on the basis of the specified statement.</paragraph>
+<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="CHG" oldref="29">If you choose "Table" or "Query", the form will refer to the table or query that you specify under <emph>Data source</emph>. If you want to create a new query or a <link href="text/shared/02/01170203.xhp" name="subform">subform</link>, then you have to choose the "SQL" option. You can then enter the statement for the SQL query or the subform directly in the <emph>List content</emph> box. The form is then generated on the basis of the specified statement.</paragraph>
 </section>
 <section id="Section4">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_ESCAPE_PROCESSING" id="bm_id3144433" localize="false"/>
@@ -194,7 +192,7 @@ YJ: checked</lastedited>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_MASTERFIELDS" id="bm_id3147097" localize="false"/>
 <paragraph role="heading" id="hd_id3153714" xml-lang="en-US" level="2" l10n="U" oldref="3">Link master fields</paragraph>
 <paragraph role="paragraph" id="par_id3147339" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="HID_PROP_MASTERFIELDS">If you create a <link href="text/shared/02/01170203.xhp" name="subform">subform</link>, enter the data field of the parent form responsible for the synchronization between parent and subform.</ahelp> To enter multiple values, press Shift + Enter after each input line.<comment>UFI: fixes #i22439#</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="CHG" oldref="71">The subform is based on an <link href="text/shared/00/00000005.xhp#sql" name="SQL">SQL</link> query; more specifically, on a <link href="text/shared/explorer/database/02010100.xhp" name="Parameter Query">Parameter Query</link>. If a field name is entered in the <emph>Link master fields</emph> box, the data contained in that field in the main form is read to a variable that you must enter in <emph>Link slave fields</emph>. In an appropriate SQL statement, this variable is compared to the table data that the subform refers to. Alternatively, you can enter the column name in the <emph>Link master fields</emph> box.<comment>UFI: must rewrite the whole subforms section due to dbs spec prop_browser_enhancements.sxw, giving examples and screenshot.</comment></paragraph>
+<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="CHG" oldref="71">The subform is based on an <link href="text/shared/00/00000005.xhp#sql" name="SQL">SQL</link> query; more specifically, on a <link href="text/shared/explorer/database/02010100.xhp" name="Parameter Query">Parameter Query</link>. If a field name is entered in the <emph>Link master fields</emph> box, the data contained in that field in the main form is read to a variable that you must enter in <emph>Link slave fields</emph>. In an appropriate SQL statement, this variable is compared to the table data that the subform refers to. Alternatively, you can enter the column name in the <emph>Link master fields</emph> box.</paragraph>
 <paragraph role="paragraph" id="par_id3156089" xml-lang="en-US" l10n="U" oldref="72">Consider the following example:</paragraph>
 <paragraph role="paragraph" id="par_id3151017" xml-lang="en-US" l10n="U" oldref="30">The database table on which the form is based is, for example, a customer database ("Customer"), where every customer has been given a unique number in a data field named "Cust_ID". A customer's orders are maintained in another database table. You now want to see each customer's orders after entering them into the form. In order to do this you should create a subform. Under <emph>Link master fields</emph> enter the data field from the customer database which clearly identifies the customer, that is, Cust_ID. Under <emph>Link slave fields</emph> enter the name of a variable which is to accept the data of the field Cust_ID, for example, x.</paragraph>
 <paragraph role="paragraph" id="par_id3151248" xml-lang="en-US" l10n="U" oldref="73">The subform should show the appropriate data from the orders table ("Orders") for each customer ID (Customer_ID -&gt; x). This is only possible if each order is uniquely assigned to one customer in the orders table. Alternatively, you can use another field called Customer_ID; however, to make sure that this field is not confused with the same field from the main form, the field is called Customer_Number.</paragraph>
@@ -217,6 +215,8 @@ YJ: checked</lastedited>
 </variable> For example, this subform can be a text box that displays the data of another database table.</paragraph>
 <paragraph role="paragraph" id="par_id3157972" xml-lang="en-US" l10n="U" oldref="35">A subform is an additional component of the main form. The main form can be called the "parent form" or "master". Subforms are needed as soon as you want to access more than one table from a form. Each additional table requires its own subform.</paragraph>
 <paragraph role="paragraph" id="par_id4807275" xml-lang="en-US" l10n="NEW">After creating a form, it can be changed into a subform. To do this, enter Design Mode, and open the Form Navigator. In the Form Navigator, drag a form (that will become a subform) onto any other form (that will become a master).</paragraph>
-<paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="CHG" oldref="36">The user of your document will not see that a form has subforms. The user only sees a form in which data is entered or where existing data is displayed.</paragraph>
+<paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="CHG" oldref="36">The user of your document will not see that a form has subforms. The user only sees a document in which data is entered or where existing data is displayed.</paragraph>
+<paragraph role="paragraph" id="par_idN10C2A" xml-lang="en-US" l10n="NEW">Specify the Link master field from the data fields in the master form. In the subform, the Link slave field can be set as a field which will be matched to the contents of the Link master field.</paragraph>
+<paragraph role="paragraph" id="par_idN10C2D" xml-lang="en-US" l10n="NEW">When the user navigates through the data, the form always displays the current data record. If there are subforms defined, the contents of the subforms will be displayed after a short delay of approximate 200 ms. This delay enables you to quickly browse through the data records of the master form. If you navigate to the next master data record within the delay limit, the subform data need not be retrieved and displayed.</paragraph>
 </body>
 </helpdocument>