tdf#131416 Syntax Diagrams omissions and cleanup

- Missing '@' in list of type declaration characters
- c(h)ar typo in fragments, refactoring in:
  - Type, Function, Property, Dim, ReDim statements
  - argument fragment

Change-Id: I97caea851d6864e44d43550f6e71873e6f55eb91
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/92769
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

1 files changed, 10 insertions, 10 deletions

diff --git a/source/text/sbasic/shared/fragments.xhp b/source/text/sbasic/shared/fragments.xhp
index a0ab0b5753..ad22ea5194 100644
--- a/source/text/sbasic/shared/fragments.xhp
+++ b/source/text/sbasic/shared/fragments.xhp
@@ -24,14 +24,14 @@
   <h4 id="hd_id431587045941514"><variable id="argumenth2"><link href="text/sbasic/shared/fragments.xhp" name="arguments in Function, Sub and Property statements"></link></variable>argument fragment</h4>
     <paragraph role="paragraph" id="par_id491585753339474"><image src="media/helpimg/sbasic/argument_fragment.svg" id="img_id4156296484514"><alt xml-lang="en-US" id="alt_id15152796484514">argument fragment</alt></image></paragraph>
     <bascode>
-      <paragraph role="bascode" id="par_id3151084" localize="false">{[Optional [ByRef|ByVal]]|ParamArray} argument {{As type-name|type-car}[ = expression]|[()]As Variant}</paragraph>
+      <paragraph role="bascode" id="par_id3151084" localize="false">{[Optional [ByRef|ByVal]]|ParamArray} argument {{As typename|char}[ = expression]|[()]As Variant}</paragraph>
     </bascode>
   <h4 id="hd_id811587303969210">Parameters</h4>
     <paragraph role="paragraph" id="par_id481586090298901"><literal>Optional</literal>: The argument is not mandatory.</paragraph>
     <paragraph role="paragraph" id="par_id331586090532804"><literal>ByRef</literal>: The argument is passed by reference. <literal>ByRef</literal> is the default.</paragraph>
     <paragraph role="paragraph" id="par_id331586090432804"><literal>ByVal</literal>: The argument is passed by value. Its value can be modified by the called routine.</paragraph>
-    <paragraph role="paragraph" id="par_id651587044335713"><emph>type-car:</emph> Type declaration character.</paragraph>
-    <paragraph role="paragraph" id="par_id651587044336713"><emph>type-name</emph>: Primitive data type name. Library or module defined types can also be specified.</paragraph>
+    <paragraph role="paragraph" id="par_id651587044335713"><emph>char:</emph> Type declaration character.</paragraph>
+    <paragraph role="paragraph" id="par_id651587044336713"><emph>typename</emph>: Primitive data type name. Library or module defined types can also be specified.</paragraph>
     <paragraph role="paragraph" id="par_id11587045141290"><emph>= expression</emph>: Specify a default value for the argument, matching its declared type. <literal>Optional</literal>  is necessary for each argument specifying a default value.</paragraph>
     <paragraph role="paragraph" id="par_id331586091432804"><literal>ParamArray</literal>: Use <literal>ParamArray</literal> when the number of parameters is undetermined. A typical scenario is that of a Calc user-defined function. Using <literal>ParamArray</literal> should be limited to the last argument of a routine.</paragraph>
     <tip id="par_id851587050837107">Using<literal>ParamArray</literal> or <emph>= expression</emph> require <link href="text/sbasic/shared/compatible.xhp" name ="Option Compatible">Option Compatible</link> to be placed before the executable program code in a module.</tip>
@@ -39,7 +39,7 @@
 </section>
 
 <section id="array">
-  <h4 id="hd_id231587046013456"><variable id="arrayh2"><link href="text/sbasic/shared/fragments.xhp" name="array syntax fragment"></link></variable>array fragment</h4>
+  <h4 id="hd_id231587046013456"><variable id="arrayh4"><link href="text/sbasic/shared/fragments.xhp" name="array syntax fragment"></link></variable>array fragment</h4>
     <paragraph role="paragraph" id="par_id491586753339473"><image src="media/helpimg/sbasic/array_fragment.svg" id="img_id4156296484514"><alt xml-lang="en-US" id="alt_id15152796484514">array fragment</alt></image></paragraph>
     <bascode>
       <paragraph role="bascode" id="par_id3150983" localize="false">( [[start To] end], .. )</paragraph>
@@ -51,18 +51,18 @@
 </section>
 
 <section id="typename">
-  <h4 id="hd_id231587046013458"><variable id="typenameh2"><link href="text/sbasic/shared/fragments.xhp" name="data types fragment"></link></variable>type-name fragment</h4>
-    <paragraph role="paragraph" id="par_id501586753339474"><image src="media/helpimg/sbasic/type-name_fragment.svg" id="img_id4157296484514"><alt xml-lang="en-US" id="alt_id15152796484515">data types fragment</alt></image></paragraph>
+  <h4 id="hd_id231587046013458"><variable id="typenameh4"><link href="text/sbasic/shared/fragments.xhp" name="data types fragment"></link></variable>typename fragment</h4>
+    <paragraph role="paragraph" id="par_id501586753339474"><image src="media/helpimg/sbasic/typename_fragment.svg" id="img_id4157296484514"><alt xml-lang="en-US" id="alt_id15152796484515">primitive data types fragment</alt></image></paragraph>
     <bascode>
       <paragraph role="bascode" id="par_id3150985" localize="false">{Boolean|Byte|Currency|Date|Double|Integer|Long|Object|Single|String|Variant}</paragraph>
     </bascode>
 </section>
 
-<section id="typecar">
-  <h4 id="hd_id231587046013459"><variable id="typecarh2"><link href="text/sbasic/shared/fragments.xhp" name="type declaration characters fragment"></link></variable>type-car fragment</h4>
-    <paragraph role="paragraph" id="par_id511586753339474"><image src="media/helpimg/sbasic/type-car_fragment.svg" id="img_id4157296484514"><alt xml-lang="en-US" id="alt_id15152796484516">type declaration characters</alt></image></paragraph>
+<section id="char">
+  <h4 id="hd_id231587046013459"><variable id="charh4"><link href="text/sbasic/shared/fragments.xhp" name="type declaration characters fragment"></link></variable>type-car fragment</h4>
+    <paragraph role="paragraph" id="par_id511586753339474"><image src="media/helpimg/sbasic/char_fragment.svg" id="img_id4157296484514"><alt xml-lang="en-US" id="alt_id15152796484516">type declaration characters</alt></image></paragraph>
     <bascode>
-      <paragraph role="bascode" id="par_id3150986" localize="false">{ % | &amp; | ! | # | $ }</paragraph>
+      <paragraph role="bascode" id="par_id3150986" localize="false">{ % | &amp; | ! | # | $ | @ }</paragraph>
     </bascode>
 </section>