INTEGRATION: CWS hc680postbeta (1.2.2); FILE MERGED

2005/01/18 12:42:51 fpe 1.2.2.1: Regular Update

2 files changed, 16 insertions, 11 deletions

diff --git a/helpcontent2/source/text/shared/02/01170101.xhp b/helpcontent2/source/text/shared/02/01170101.xhp
index f5ee15ef72..033c47a8f8 100644
--- a/helpcontent2/source/text/shared/02/01170101.xhp
+++ b/helpcontent2/source/text/shared/02/01170101.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-26T14:34:36">UFI: numerous changes due to dba spec prop_browser_enhancements.sxw - FPE: Adjusted notes and tips and repaired a section
+<lastedited date="2005-01-05T17:26:48">UFI: numerous changes due to dba spec prop_browser_enhancements.sxw - FPE: Adjusted notes and tips and repaired a section
 UFI: more changes, see comment
 UFI: added controls, see "Navigation Bar form control" spec
 dedr: reviewed</lastedited>
@@ -383,7 +383,7 @@ dedr: reviewed</lastedited>
 </section>
 <section id="targetframe">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_TARGET_FRAME" id="bm_id3149491" localize="false"/>
-<paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="2" l10n="U" oldref="60">Target Frame</paragraph>
+<paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="2" l10n="CHG" oldref="60">Frame</paragraph>
 <paragraph role="paragraph" id="par_id3154991" xml-lang="en-US" l10n="CHG" oldref="61"><ahelp hid="HID_PROP_TARGET_FRAME" visibility="hidden">Specifies the target frame to display the document that is opened by the "Open document / web page" action.</ahelp>You can also specify the target frame to display a <link href="text/shared/02/01170101.xhp" name="URL"><emph>URL</emph></link> that you open when you click a button that has been assigned the <link href="text/shared/02/01170101.xhp" name="Type URL">Open document / web page action</link>).</paragraph>
 <section id="fuerformulareigenschaft">
 <paragraph role="paragraph" id="par_id3150521" xml-lang="en-US" l10n="U" oldref="62">If you click the field, you can select an option from the list that specifies into which frame the next document should be loaded. The following possibilities exist:</paragraph>
@@ -431,7 +431,7 @@ dedr: reviewed</lastedited>
 </table>
 
 </section>
-<paragraph role="note" id="par_id3156172" xml-lang="en-US" l10n="U" oldref="185">The Target Frame property is relevant for HTML forms, but not for database forms.</paragraph>
+<paragraph role="note" id="par_id3156172" xml-lang="en-US" l10n="CHG" oldref="185">The Frame property is relevant for HTML forms, but not for database forms.</paragraph>
 </section>
 <section id="Section46">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_IMAGE_URL" id="bm_id3156191" localize="false"/>
@@ -516,6 +516,7 @@ dedr: reviewed</lastedited>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_TEXTTYPE" id="bm_id6511734" localize="false"/>
 <paragraph role="heading" id="hd_id3148527" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Text type<comment>UFI: now renamed to Text Type, see #i24386#</comment><comment>UFI: see dba spec prop_browser_enhancements.sxw</comment></paragraph>
 <paragraph role="paragraph" id="par_id3153724" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="37933">Allows you to use line breaks and formatting in a control field, such as a text box or label. To manually enter a line break, press the Enter key. Select "Multi-line with formatting" to enter formatted text.</ahelp></paragraph>
+<paragraph role="warning" id="par_idN113D2" xml-lang="en-US" l10n="NEW">If you select the text type "Multi-line with formatting", you cannot bind this control to a database field.</paragraph>
 <paragraph role="note" id="par_idN11391" xml-lang="en-US" l10n="NEW">This control is named "Multiline input" for a text column inside a table control.</paragraph>
 </section>
 <section id="Section47">
diff --git a/helpcontent2/source/text/shared/02/01170102.xhp b/helpcontent2/source/text/shared/02/01170102.xhp
index 9b4c798759..11a38f9d45 100644
--- a/helpcontent2/source/text/shared/02/01170102.xhp
+++ b/helpcontent2/source/text/shared/02/01170102.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:18:52">UFI: added spec "Form Controls Linked to Spreadsheet Cells", sc.features "eforms2 ..."
+<lastedited date="2004-12-10T14:43:12">UFI: added spec "Form Controls Linked to Spreadsheet Cells", sc.features "eforms2 ..."
 YJ:checked</lastedited>
 </history>
 </meta>
@@ -84,16 +84,20 @@ YJ:checked</lastedited>
 <paragraph role="note" id="par_id3148773" xml-lang="en-US" l10n="U" oldref="64">For forms with database links, the associated database is defined in the <link href="text/shared/02/01170200.xhp" name="Form Properties">Form Properties</link>. You will find the functions for this on the <link href="text/shared/02/01170203.xhp" name="Data"><emph>Data</emph></link> tab page.</paragraph>
 <paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="65">The possible settings of the <emph>Data</emph> tab page of a control depend on the respective control. You will only see the options that are available for the current control and context. The following fields are available:</paragraph>
 <sort order="asc">
+<section id="Section10">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_UNCHECKEDREFVALUE" id="bm_id7939695" localize="false"/>
+<paragraph role="heading" id="par_idN108B4" xml-lang="en-US" level="2" l10n="NEW">Reference value (off)</paragraph>
+<paragraph role="paragraph" id="par_idN108B8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Check boxes and radio buttons in Spreadsheets can be bound to cells in the current document. If the control is enabled, the value you enter in Reference value (on) is copied to the cell. If the control is disabled, the value from Reference value (off) is copied to the cell.</ahelp></paragraph>
+</section>
 <section id="Section23">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_REFVALUE" id="bm_id3147327" localize="false"/>
-<paragraph role="heading" id="hd_id3159121" xml-lang="en-US" level="2" l10n="U" oldref="71">Reference value<comment>UFI: moved section from 01170101</comment></paragraph>
+<paragraph role="heading" id="hd_id3159121" xml-lang="en-US" level="2" l10n="CHG" oldref="71">Reference value (on)<comment>UFI: moved section from 01170101, changed name</comment></paragraph>
 <paragraph role="paragraph" id="par_id3163812" xml-lang="en-US" l10n="U" oldref="141"><ahelp hid="HID_PROP_REFVALUE" visibility="hidden">You can enter a reference value for the web form, which will be remitted to a server when sending the form. With database forms, the value entered is written in the database field, assigned to the control field.</ahelp>You can assign a reference value to option buttons and check boxes. The reference value will be remitted to a server when sending the web form. With database forms the value entered here will be written in the database assigned to the control field.</paragraph>
 <paragraph role="paragraph" id="par_id3150225" xml-lang="en-US" l10n="U" oldref="204">
 <emph>Reference values for Web forms</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3147611" xml-lang="en-US" l10n="U" oldref="205">Reference values are useful if you design a Web form and the information on the status of the control is to be transmitted to a server. If the control is clicked by the user, the corresponding reference value is sent to the server. If you specify no reference value, "ON" is transmitted when sending the form if the control was activated by the user.</paragraph>
+<paragraph role="paragraph" id="par_id3147611" xml-lang="en-US" l10n="U" oldref="205">Reference values are useful if you design a Web form and the information on the status of the control is to be transmitted to a server. If the control is clicked by the user, the corresponding reference value is sent to the server.</paragraph>
 <paragraph role="paragraph" id="par_id3149570" xml-lang="en-US" l10n="U" oldref="194">For example, if you have two control fields for the options "feminine" and "masculine", and assign a reference value of 1 to the field "feminine" and the value 2 to the "masculine" field, the value 1 is transmitted to the server if a user clicks the "feminine" field and value 2 is sent if the "masculine" field is clicked.</paragraph>
-<paragraph role="paragraph" id="par_id3157963" xml-lang="en-US" l10n="U" oldref="196">If you assign no reference value, "ON" is sent for every activated control; if the two fields "feminine" and "masculine" are <link href="text/shared/02/01170101.xhp" name="grouped">grouped</link>, "ON" is transmitted for the group if one of the fields was clicked. Therefore, you should make sure to define reference values in the grouping if the transmitted information "ON" is not sufficient to characterize the state of the controls.</paragraph>
 <paragraph role="paragraph" id="par_id3150260" xml-lang="en-US" l10n="U" oldref="206">
 <emph>Reference values for database forms</emph>
 </paragraph>