corrections and clarifications on help page for field Variables

- correction of "Chapter by Numbering" name
- add indications of when certain options appear for different options.
- add "DDE Statement" (and embed explanation from "Section")
- move warning to more appropriate place
- <h1>, <h2>, <h3>, <warning>
- add <section>  and <variable> in Cross-references help page
so they can be embedded for Name"into Variables page.
- add <section> in Section help page about DDE to embed in
Variables.
- remove unnecessary spaces

Change-Id: Ibbaa2d2beb482ee95d10d5e632d41603a7e152ae
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/90041
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>

3 files changed, 28 insertions, 25 deletions

diff --git a/source/text/swriter/01/04020100.xhp b/source/text/swriter/01/04020100.xhp
index 824be672f1..a917a9d64c 100644
--- a/source/text/swriter/01/04020100.xhp
+++ b/source/text/swriter/01/04020100.xhp
@@ -57,8 +57,10 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/editsectiondialog/dde" id="bm_id3154573" localize="false"/>
 <paragraph role="heading" id="hd_id3153672" xml-lang="en-US" level="3">DDE<comment>UFI: WIN only, while fixing #109638#</comment></paragraph>
 <paragraph role="paragraph" id="par_id3151310" xml-lang="en-US"><ahelp hid=".">Creates a <emph>DDE </emph>link. Select this check box, and then enter the <emph>DDE </emph>command that you want to use. The <emph>DDE</emph> option is only available if the <emph>Link</emph> check box is selected.</ahelp></paragraph>
+<section id="DDE_Statement">
 <paragraph role="paragraph" id="par_id3143280" xml-lang="en-US">The general syntax for a DDE command is: "&lt;Server&gt; &lt;Topic&gt; &lt;Item&gt;", where server is the DDE name for the application that contains the data. Topic refers to the location of the Item (usually the file name), and Item represents the actual object.</paragraph>
-<paragraph role="paragraph" id="par_id3149098" xml-lang="en-US">For example, to insert a section named "Section1" from a $[officename] text document abc.odt as a DDE link, use the command: "soffice x:\abc.odt Section1". To insert the contents of the first cell from a Microsoft Excel spreadsheet file called "abc.xls", use the command: "excel x:\[abc.xls]Sheet1 z1s1". You can also copy the elements that you want to insert as a DDE link, and then <emph>Edit - Paste Special</emph>. You can then view the DDE command for the link, by selecting the contents and choosing <emph>Edit - Fields</emph>.</paragraph>
+</section>
+ <paragraph role="paragraph" id="par_id3149098" xml-lang="en-US">For example, to insert a section named "Section1" from a $[officename] text document abc.odt as a DDE link, use the command: "soffice x:\abc.odt Section1". To insert the contents of the first cell from a Microsoft Excel spreadsheet file called "abc.xls", use the command: "excel x:\[abc.xls]Sheet1 z1s1". You can also copy the elements that you want to insert as a DDE link, and then <emph>Edit - Paste Special</emph>. You can then view the DDE command for the link, by selecting the contents and choosing <emph>Edit - Fields</emph>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/sectionpage/filename" id="bm_id3149038" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/editsectiondialog/filename" id="bm_id3149042" localize="false"/>
 <paragraph role="heading" id="hd_id3153640" xml-lang="en-US" level="3">File name<switchinline select="sys"><caseinline select="WIN"> / DDE command
diff --git a/source/text/swriter/01/04090002.xhp b/source/text/swriter/01/04090002.xhp
index 614b5ce8e6..8bc1fdfd0b 100644
--- a/source/text/swriter/01/04090002.xhp
+++ b/source/text/swriter/01/04090002.xhp
@@ -19,7 +19,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
 <meta>
 <topic id="textswriter0104090002xml" indexer="include">
 <title id="tit" xml-lang="en-US">Cross-references</title>
@@ -231,9 +230,11 @@
 <paragraph role="note" id="par_id5189062" xml-lang="en-US">For example, when you are in a chapter 1, subchapter 2, subpart 5, this may be numbered as 1.2.5. When you insert here a reference to text in the previous subpart "1.2.4" and you apply the "Number" format, then the reference will be shown as "4". If in this example the numbering is set to show more sublevels, the same reference will be shown as "2.4" or "1.2.4", depending on the setting. If you use the "Number (full context)" format, you will always see "1.2.4", no matter how the numbered paragraph is formatted.</paragraph>
 </section>
 <section id="name">
+<section id="name2">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldrefpage/name" id="bm_id3156253" localize="false"/>
-<paragraph role="heading" id="hd_id3156242" xml-lang="en-US" level="2">Name</paragraph>
-<paragraph role="paragraph" id="par_id3156259" xml-lang="en-US"><ahelp hid="modules/swriter/ui/fldrefpage/name">Type the name of the user-defined field that you want to create.</ahelp> To set a target, click "Set Reference" in the <emph>Type</emph> list, type a name in this box, and then click <emph>Insert</emph>. To reference the new target, click the target name in the <emph>Selection</emph> list.</paragraph>
+<h2 id="hd_id3156242" xml-lang="en-US">Name</h2>
+</section>
+<paragraph role="paragraph" id="par_id3156259" xml-lang="en-US"><variable id="FieldValue"><ahelp hid="modules/swriter/ui/fldrefpage/name">Type the name of the user-defined field that you want to create.</ahelp></variable> To set a target, click "Set Reference" in the <emph>Type</emph> list, type a name in this box, and then click <emph>Insert</emph>. To reference the new target, click the target name in the <emph>Selection</emph> list.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3156032" xml-lang="en-US">In a master document, targets that are in different sub-documents are not displayed in the<emph> Selection</emph> list. If you want to insert a reference to the target, you must type the path and the name in the <emph>Name </emph>box.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldrefpage/value" id="bm_id3159204" localize="false"/>
diff --git a/source/text/swriter/01/04090005.xhp b/source/text/swriter/01/04090005.xhp
index 2060c11edb..f122588b2c 100644
--- a/source/text/swriter/01/04090005.xhp
+++ b/source/text/swriter/01/04090005.xhp
@@ -19,10 +19,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
 <meta>
 <topic id="textswriter0104090005xml" indexer="include">
-<title id="tit" xml-lang="en-US">Variables</title>
+<title id="tit" xml-lang="en-US">Variables (fields)</title>
 <filename>/text/swriter/01/04090005.xhp</filename>
 </topic>
 </meta>
@@ -32,13 +31,12 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/FldVarPage" id="bm_id3151266" localize="false"/>
-<paragraph role="heading" id="hd_id3153716" xml-lang="en-US" level="1"><link href="text/swriter/01/04090005.xhp" name="Variables">Variables</link></paragraph>
+<h1 id="hd_id3153716" xml-lang="en-US"><link href="text/swriter/01/04090005.xhp" name="Variables">Variables</link></h1>
 <paragraph role="paragraph" id="par_id3150764" xml-lang="en-US"><ahelp hid=".">Variable fields let you add dynamic content to your document. For example, you can use a variable to reset the page numbering.</ahelp></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/swriter/00/00000404.xhp#feldvariablen"/>
 </section>
-<paragraph role="warning" id="par_id3149759" xml-lang="en-US">User-defined fields are only available in the current document.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/type" id="bm_id3154692" localize="false"/>
 <paragraph role="paragraph" id="par_id0903200802243625" xml-lang="en-US"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#feldtyp"/>
@@ -127,16 +125,17 @@
 </tablerow>
 </table>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/select" id="bm_id3150684" localize="false"/>
-<paragraph role="heading" id="hd_id3888363" xml-lang="en-US" level="2">Select<comment>on all tab pages this is called "Select", except for "Cross-References", which uses "Selection"</comment></paragraph>
+<h2 id="hd_id3888363" xml-lang="en-US">Select<comment>on all tab pages this is called "Select", except for "Cross-References", which uses "Selection"</comment></h2>
 <paragraph role="paragraph" id="par_id7453535" xml-lang="en-US"><ahelp hid="modules/swriter/ui/fldvarpage/select"><variable id="selecthelp">Lists the available fields for the field type selected in the <emph>Type </emph>list.</variable> To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
-<paragraph role="tip" id="par_id3326822" xml-lang="en-US">To quickly insert a field from the <emph>Select</emph> list, hold down <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
+<paragraph role="tip" id="par_id3326822" xml-lang="en-US">To quickly insert a field from the <emph>Select</emph> list, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/numformat" id="bm_id3148875" localize="false"/>
 <paragraph role="paragraph" id="par_id0903200802243892" xml-lang="en-US"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#format"/><comment>Provides Format header and explanation</comment>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/name" id="bm_id3150108" localize="false"/>
 <paragraph role="paragraph" id="par_id0903200802243880" xml-lang="en-US"><ahelp hid="." visibility="hidden">Type the name of the user-defined field that you want to create.</ahelp></paragraph>
-<embed href="text/swriter/01/04090002.xhp#name"/><comment>Provides Name header and explanation</comment>
+<embed href="text/swriter/01/04090002.xhp#name2"/><comment>Provides Name header and explanation</comment>
+<paragraph role="paragraph" id="par_id381583794664065"><embedvar href="text/swriter/01/04090002.xhp#FieldName)"/> This option is available for "Set variable", "DDE field", "Number range" and "User Field" field types.</paragraph>
+<warning id="par_id3149759" xml-lang="en-US">User-defined fields are only available in the current document.</warning>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/value" id="bm_id3150119" localize="false"/>
 <paragraph role="paragraph" id="par_id0903200802243951" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the contents that you want to add to a user-defined field.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#wert"/>
@@ -144,26 +143,30 @@
 <paragraph role="paragraph" id="par_id3155860" xml-lang="en-US"><ahelp hid="modules/swriter/ui/fldvarpage/format">In the <emph>Format</emph> list, define if the value is inserted as text or a number.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#hinweis"/><comment>Warns that following types depend on the selection in the Type list</comment>
 <paragraph role="paragraph" id="par_id3150696" xml-lang="en-US">In an HTML document, two additional fields are available for the "Set variable" field type: HTML_ON and HTML_OFF. The text that you type in the <emph>Value </emph>box is converted to an opening HTML <link href="text/shared/00/00000002.xhp#tags" name="tag">tag</link> (&lt;Value&gt;) or to a closing HTML (&lt;/Value&gt;) tag when the file is saved as an HTML document, depending on the option that you select.</paragraph>
-<paragraph role="heading" id="hd_id3155969" xml-lang="en-US" level="2">Formula</paragraph>
+<h2 id="hd_id871583773320305">DDE Statement</h2>
+<embed href="text/swriter/01/04020100.xhp#DDE_Statement"/><comment>taken from DDE in Section</comment>
+<paragraph role="paragraph" id="par_id481583773333848">This option is only available if the "DDE field" field type is selected.</paragraph>
+<h2 id="hd_id3155969" xml-lang="en-US">Formula</h2>
 <paragraph role="paragraph" id="par_id3155982" xml-lang="en-US">This option is only available if the "Insert Formula" field type is selected.</paragraph>
 <embed href="text/swriter/01/04090003.xhp#hinweis"/>
 <embed href="text/swriter/01/04090001.xhp#korrektur"/>
+<paragraph role="paragraph" id="par_id71583772995807">This option is only available if the "Set page variable" field type is selected.</paragraph>
 <section id="unsichtbar">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/invisible" id="bm_id3156226" localize="false"/>
-<paragraph role="heading" id="hd_id3149229" xml-lang="en-US" level="2">Invisible</paragraph>
+<h2 id="hd_id3149229" xml-lang="en-US">Invisible</h2>
 <paragraph role="paragraph" id="par_id3156233" xml-lang="en-US"><variable id="invisiblehelp"><ahelp hid="modules/swriter/ui/fldvarpage/invisible">Hides the field contents in the document.</ahelp> The field is inserted as a thin gray mark in the document.</variable> This option is only available for the "Set Variable" and "User Field" field types.</paragraph>
 </section>
-<paragraph role="heading" id="hd_id3146326" xml-lang="en-US" level="2">Chapter numbering</paragraph>
-<paragraph role="paragraph" id="par_id3146340" xml-lang="en-US">Sets the options for resetting chapter numbers.</paragraph>
+<h2 id="hd_id3146326" xml-lang="en-US">Numbering by Chapter</h2>
+<paragraph role="paragraph" id="par_id3146340" xml-lang="en-US">Sets the options for resetting chapter numbers. <variable id="NumberRange">This option is only available for the "Number range" field type.</variable></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/level" id="bm_id3149829" localize="false"/>
-<paragraph role="heading" id="hd_id3147456" xml-lang="en-US" level="3">Level</paragraph>
-<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US"><ahelp hid="modules/swriter/ui/fldvarpage/level">Choose the heading or chapter level at which to restart numbering in the document.</ahelp></paragraph>
+<h3 id="hd_id3147456" xml-lang="en-US">Level</h3>
+<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US"><ahelp hid="modules/swriter/ui/fldvarpage/level">Choose the heading or chapter level at which to restart numbering in the document.</ahelp> <embedvar href="text/swriter/01/04090005.xhp#NumberRange"/></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/separator" id="bm_id3147605" localize="false"/>
-<paragraph role="heading" id="hd_id3147594" xml-lang="en-US" level="3">Separator</paragraph>
-<paragraph role="paragraph" id="par_id3148846" xml-lang="en-US"><ahelp hid="modules/swriter/ui/fldvarpage/separator">Type the character that you want to use as a separator between the heading or chapter levels.</ahelp></paragraph>
+<h3 id="hd_id3147594" xml-lang="en-US">Separator</h3>
+<paragraph role="paragraph" id="par_id3148846" xml-lang="en-US"><ahelp hid="modules/swriter/ui/fldvarpage/separator">Type the character that you want to use as a separator between the heading or chapter levels.</ahelp> <embedvar href="text/swriter/01/04090005.xhp#NumberRange"/></paragraph>
 <section id="uebernehmen">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/apply" id="bm_id3147069" localize="false"/>
-<paragraph role="heading" id="hd_id3147057" xml-lang="en-US" level="2">Apply</paragraph>
+<h2 id="hd_id3147057" xml-lang="en-US">Apply</h2>
 <paragraph role="paragraph" id="par_id3155562" xml-lang="en-US"><ahelp hid="modules/swriter/ui/fldvarpage/apply">Adds the user-defined field to the <emph>Select</emph> list.</ahelp></paragraph>
 <embed href="text/swriter/02/14040000.xhp#syuebernehmen"/>
 </section>
@@ -174,16 +177,13 @@
 <table id="tbl_id3154080">
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3145318" xml-lang="en-US">
-<image id="img_id3153293" src="svx/res/nu02.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153293" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
+<paragraph role="paragraph" id="par_id3145318" xml-lang="en-US"><image id="img_id3153293" src="svx/res/nu02.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153293" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150169" xml-lang="en-US">Delete</paragraph>
 </tablecell>
 </tablerow>
 </table>
-
 </section>
 </body>
 </helpdocument>