Zwischenstand

1 files changed, 53 insertions, 51 deletions

diff --git a/helpcontent2/source/text/swriter/01/04090200.xhp b/helpcontent2/source/text/swriter/01/04090200.xhp
index 66da064bd8..9e143f2345 100755
--- a/helpcontent2/source/text/swriter/01/04090200.xhp
+++ b/helpcontent2/source/text/swriter/01/04090200.xhp
@@ -11,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -74,18 +74,18 @@
       <table id="tbl_id3153537">
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3153677" role="paragraph" l10n="CHG" oldref="19">TRUE</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153677" role="tablecontent" l10n="CHG" oldref="19">TRUE</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3152960" role="paragraph" l10n="U" oldref="20">The condition is always met. You can also enter any value not equal to 0 as the conditional text.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3152960" role="tablecontent" l10n="U" oldref="20">The condition is always met. You can also enter any value not equal to 0 as the conditional text.</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3155900" role="paragraph" l10n="CHG" oldref="21">FALSE</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3155900" role="tablecontent" l10n="CHG" oldref="21">FALSE</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3154191" role="paragraph" l10n="U" oldref="22">The condition is not met. You can also enter the value 0.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154191" role="tablecontent" l10n="U" oldref="22">The condition is not met. You can also enter the value 0.</paragraph>
             </tablecell>
          </tablerow>
       </table>
@@ -114,26 +114,26 @@
       <table id="tbl_id3155867">
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3147417" role="paragraph" l10n="U" oldref="32">x == 1 or x EQ 1</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147417" role="tablecontent" l10n="U" oldref="32">x == 1 or x EQ 1</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3147500" role="paragraph" l10n="U" oldref="33">The condition is true if "x" is equal to 1.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147500" role="tablecontent" l10n="U" oldref="33">The condition is true if "x" is equal to 1.</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3145259" role="paragraph" l10n="U" oldref="34">x != 1 or x NEQ 1</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3145259" role="tablecontent" l10n="U" oldref="34">x != 1 or x NEQ 1</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3150551" role="paragraph" l10n="U" oldref="35">The condition is true if "x" does not equal 1.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150551" role="tablecontent" l10n="U" oldref="35">The condition is true if "x" does not equal 1.</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3147749" role="paragraph" l10n="U" oldref="36">sinx == 0</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147749" role="tablecontent" l10n="U" oldref="36">sinx == 0</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3146345" role="paragraph" l10n="U" oldref="37">The condition is true if "x" is a multiple of pi.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3146345" role="tablecontent" l10n="U" oldref="37">The condition is true if "x" is a multiple of pi.</paragraph>
             </tablecell>
          </tablerow>
       </table>
@@ -142,20 +142,20 @@
       <table id="tbl_id3148855">
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3151078" role="paragraph" l10n="U" oldref="39">x == "ABC" or x EQ "ABC"</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3151078" role="tablecontent" l10n="U" oldref="39">x == "ABC" or x EQ "ABC"</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3150162" role="paragraph" l10n="U" oldref="40">Checks if variable "x" contains (true) the "ABC" string, or not (false).</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150162" role="tablecontent" l10n="U" oldref="40">Checks if variable "x" contains (true) the "ABC" string, or not (false).</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3153301" role="paragraph" l10n="U" oldref="41">x == "" or x EQ ""</paragraph>
-               <paragraph xml-lang="en-US" id="par_id3156120" role="paragraph" l10n="U" oldref="90">or</paragraph>
-               <paragraph xml-lang="en-US" id="par_id3156133" role="paragraph" l10n="U" oldref="42">!x or NOT x</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153301" role="tablecontent" l10n="U" oldref="41">x == "" or x EQ ""</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156120" role="tablecontent" l10n="U" oldref="90">or</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156133" role="tablecontent" l10n="U" oldref="42">!x or NOT x</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3156112" role="paragraph" l10n="U" oldref="44">Checks if the variable "x" contains an empty string.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156112" role="tablecontent" l10n="U" oldref="44">Checks if the variable "x" contains an empty string.</paragraph>
             </tablecell>
          </tablerow>
       </table>
@@ -168,130 +168,130 @@
       <table id="tbl_id3153139">
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3149632" role="paragraph" l10n="U" oldref="130">Variable</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149632" role="tablehead" l10n="U" oldref="130">Variable</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3150662" role="paragraph" l10n="U" oldref="131">Meaning</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150662" role="tablehead" l10n="U" oldref="131">Meaning</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3154026" role="paragraph" l10n="U" oldref="98">user_firstname</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154026" role="tablecontent" l10n="U" oldref="98">user_firstname</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3149953" role="paragraph" l10n="U" oldref="99">First name</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149953" role="tablecontent" l10n="U" oldref="99">First name</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3147272" role="paragraph" l10n="U" oldref="100">user_lastname</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147272" role="tablecontent" l10n="U" oldref="100">user_lastname</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3149601" role="paragraph" l10n="U" oldref="101">Last name</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149601" role="tablecontent" l10n="U" oldref="101">Last name</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3150770" role="paragraph" l10n="U" oldref="102">user_initials</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150770" role="tablecontent" l10n="U" oldref="102">user_initials</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3155529" role="paragraph" l10n="U" oldref="103">Initials</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3155529" role="tablecontent" l10n="U" oldref="103">Initials</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3148705" role="paragraph" l10n="U" oldref="104">user_company</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3148705" role="tablecontent" l10n="U" oldref="104">user_company</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3148728" role="paragraph" l10n="U" oldref="105">Company</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3148728" role="tablecontent" l10n="U" oldref="105">Company</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3155361" role="paragraph" l10n="U" oldref="106">user_street</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3155361" role="tablecontent" l10n="U" oldref="106">user_street</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3154222" role="paragraph" l10n="U" oldref="107">Street</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154222" role="tablecontent" l10n="U" oldref="107">Street</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3145108" role="paragraph" l10n="U" oldref="108">user_country</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3145108" role="tablecontent" l10n="U" oldref="108">user_country</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3146885" role="paragraph" l10n="U" oldref="109">Country</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3146885" role="tablecontent" l10n="U" oldref="109">Country</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3149580" role="paragraph" l10n="U" oldref="110">user_zipcode</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149580" role="tablecontent" l10n="U" oldref="110">user_zipcode</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3156241" role="paragraph" l10n="U" oldref="111">Zip code</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156241" role="tablecontent" l10n="U" oldref="111">Zip code</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="112">user_city</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3148922" role="tablecontent" l10n="U" oldref="112">user_city</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3148945" role="paragraph" l10n="U" oldref="113">City</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3148945" role="tablecontent" l10n="U" oldref="113">City</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3156053" role="paragraph" l10n="U" oldref="114">user_title</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156053" role="tablecontent" l10n="U" oldref="114">user_title</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3159219" role="paragraph" l10n="U" oldref="115">Title</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3159219" role="tablecontent" l10n="U" oldref="115">Title</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3156435" role="paragraph" l10n="U" oldref="116">user_position</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156435" role="tablecontent" l10n="U" oldref="116">user_position</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3145178" role="paragraph" l10n="U" oldref="117">Position</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3145178" role="tablecontent" l10n="U" oldref="117">Position</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3150797" role="paragraph" l10n="U" oldref="118">user_tel_work</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150797" role="tablecontent" l10n="U" oldref="118">user_tel_work</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3150820" role="paragraph" l10n="U" oldref="119">Business telephone number</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150820" role="tablecontent" l10n="U" oldref="119">Business telephone number</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3150894" role="paragraph" l10n="U" oldref="120">user_tel_home</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150894" role="tablecontent" l10n="U" oldref="120">user_tel_home</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3155320" role="paragraph" l10n="U" oldref="121">Home telephone number</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3155320" role="tablecontent" l10n="U" oldref="121">Home telephone number</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3154400" role="paragraph" l10n="U" oldref="122">user_fax</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154400" role="tablecontent" l10n="U" oldref="122">user_fax</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3153363" role="paragraph" l10n="U" oldref="123">Fax number</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153363" role="tablecontent" l10n="U" oldref="123">Fax number</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3153390" role="paragraph" l10n="U" oldref="124">user_email</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153390" role="tablecontent" l10n="U" oldref="124">user_email</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3154948" role="paragraph" l10n="U" oldref="125">E-mail address</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154948" role="tablecontent" l10n="U" oldref="125">E-mail address</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3145603" role="paragraph" l10n="U" oldref="126">user_state</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3145603" role="tablecontent" l10n="U" oldref="126">user_state</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3150129" role="paragraph" l10n="U" oldref="127">State (not in all $[officename] versions)</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150129" role="tablecontent" l10n="U" oldref="127">State (not in all $[officename] versions)</paragraph>
             </tablecell>
          </tablerow>
       </table>
@@ -351,13 +351,15 @@
 
       <paragraph xml-lang="en-US" id="par_id3159247" role="note" l10n="U" oldref="53">Note the difference between the boolean NOT "!" and the comparative operator not equal "!=" (NEQ).</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153876" role="paragraph" l10n="CHG" oldref="54">When you refer to a database field in a condition, use the form Databasename.Tablename.Fieldname. If one of the names contains a character that is an operator, such as a minus sign (-), enclose the name in square brackets, for example, Databasename.[Table-name].Fieldname. Never use spaces inside field names.<comment>UFI: fixes bug #i25781# - but see #i25983#. Fixes also #i19571#</comment></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153891" role="paragraph" l10n="U" oldref="55">Example: Hiding an Empty Database Field</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153891" role="heading" level="3" l10n="U"
+                 oldref="55">Example: Hiding an Empty Database Field</paragraph>
       <paragraph xml-lang="en-US" id="par_id3150051" role="paragraph" l10n="U" oldref="56">You may want to create a condition that hides an empty field, for example, if the COMPANY field is empty for some of the data records.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3150067" role="paragraph" l10n="CHG" oldref="57">Select the <emph>Hidden Paragraph</emph> list entry, and type the following condition: Addressbook.Addresses.Company EQ ""</paragraph>
       <paragraph xml-lang="en-US" id="par_id3147110" role="paragraph" l10n="U" oldref="150">or type the following</paragraph>
       <paragraph xml-lang="en-US" id="par_id3147123" role="paragraph" l10n="U" oldref="151">NOT Addressbook.Addresses.Company</paragraph>
       <paragraph xml-lang="en-US" id="par_id3147136" role="paragraph" l10n="U" oldref="152">If the COMPANY database field is empty, the condition is true and the paragraph is hidden.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and clear the <emph>Fields: Hidden paragraphs</emph> check box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and enable the <emph>Fields: Hidden </emph>
+         <emph>paragraphs</emph> check box.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3145218" role="heading" level="2" l10n="U"
                  oldref="59">Examples of Conditions in Fields</paragraph>
       <paragraph xml-lang="en-US" id="par_id3145231" role="paragraph" l10n="U" oldref="60">The following examples use the Conditional text field, although they can be applied to any fields that can be linked to a condition. The syntax used for conditions is also used for the Hidden text, Hidden paragraph, Any record or Next record fields.</paragraph>