source/media/helpimg/sbasic/type-car_fragment.svg | 17 ++++++++---------
source/text/sbasic/shared/fragments.xhp | 7 ++++---
2 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 44640598eda121aa83d4e89b874579d90f00e6fb
Author: LibreOfficiant <libreoffici...@sfr.fr>
AuthorDate: Wed Apr 22 16:40:44 2020 +0100
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Thu Apr 23 17:17:48 2020 +0200
tdf#36737 Clarify routine arguments initialisation
in those contexts:
- native LibreOffice Basic
- w/ Option Compatible
- w/ Option VBASupport 1/0
- Added missing Byte, Boolean datatypes
- type declaration caracters fragment conciser layout
Change-Id: I53387018223466ef7452d87fb166d5d9e6de0594
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/92540
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/media/helpimg/sbasic/type-car_fragment.svg
b/source/media/helpimg/sbasic/type-car_fragment.svg
index db648bbdd..8bc73c93e 100644
--- a/source/media/helpimg/sbasic/type-car_fragment.svg
+++ b/source/media/helpimg/sbasic/type-car_fragment.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="230" viewBox="0 0 188.5 230"
width="188.5" xmlns="http://www.w3.org/2000/svg";>
+<svg class="railroad-diagram" height="102" viewBox="0 0 472.5 102"
width="472.5" xmlns="http://www.w3.org/2000/svg";>
<g transform="translate(.5 .5)">
<style>/* <![CDATA[ */
svg.railroad-diagram {
@@ -28,11 +28,10 @@
/* ]]> */
</style><g>
-<path d="M20 105v20m0 -10h20"></path></g><path d="M40 115h10"></path><g>
-<path d="M50 115h0.0"></path><path d="M138.5 115h0.0"></path><g>
-<path d="M50.0 115h0.0"></path><path d="M138.5 115h0.0"></path><path d="M50.0
115a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><g class="terminal">
-<path d="M80.0 73h0.0"></path><path d="M108.5 73h0.0"></path><rect height="22"
rx="10" ry="10" width="28.5" x="80.0" y="62"></rect><text x="94.25"
y="77">&</text></g><path d="M108.5 73a15 15 0 0 1 15 15v12a15 15 0 0 0 15
15"></path><path d="M50.0 115a15 15 0 0 0 15 -15v-54a15 15 0 0 1 15
-15"></path><g class="terminal">
-<path d="M80.0 31h0.0"></path><path d="M108.5 31h0.0"></path><rect height="22"
rx="10" ry="10" width="28.5" x="80.0" y="20"></rect><text x="94.25"
y="35">%</text></g><path d="M108.5 31a15 15 0 0 1 15 15v54a15 15 0 0 0 15
15"></path><path d="M50.0 115h30"></path><g class="terminal">
-<path d="M80.0 115h0.0"></path><path d="M108.5 115h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="80.0" y="104"></rect><text
x="94.25" y="119">!</text></g><path d="M108.5 115h30"></path><path d="M50.0
115a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M80.0 157h0.0"></path><path d="M108.5 157h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="80.0" y="146"></rect><text
x="94.25" y="161">#</text></g><path d="M108.5 157a15 15 0 0 0 15 -15v-12a15 15
0 0 1 15 -15"></path><path d="M50.0 115a15 15 0 0 1 15 15v54a15 15 0 0 0 15
15"></path><g class="terminal">
-<path d="M80.0 199h0.0"></path><path d="M108.5 199h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="80.0" y="188"></rect><text
x="94.25" y="203">$</text></g><path d="M108.5 199a15 15 0 0 0 15 -15v-54a15 15
0 0 1 15 -15"></path></g></g><path d="M138.5 115h10"></path><path d="M 148.5
115 h 20 m 0 -10 v 20"></path></g></svg>
\ No newline at end of file
+<path d="M20 41v20m0 -10h20"></path></g><g>
+<path d="M40 51h0.0"></path><path d="M432.5 51h0.0"></path><path d="M40.0
51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15h269.0"></path><path d="M133.5
82h269.0a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><path d="M40.0
51h15"></path><g class="terminal">
+<path d="M55.0 51h10.0"></path><path d="M93.5 51h10.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="65.0" y="40"></rect><text x="79.25"
y="55">%</text></g><path d="M103.5 51a15 15 0 0 1 15 15v1a15 15 0 0 0 15
15"></path><path d="M103.5 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g
class="terminal">
+<path d="M133.5 51h10.0"></path><path d="M172.0 51h10.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="143.5" y="40"></rect><text
x="157.75" y="55">&</text></g><path d="M182.0 51a15 15 0 0 1 15 15v1a15 15
0 0 0 15 15"></path><path d="M182.0 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15
15"></path><g class="terminal">
+<path d="M212.0 51h10.0"></path><path d="M250.5 51h10.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="222.0" y="40"></rect><text
x="236.25" y="55">!</text></g><path d="M260.5 51a15 15 0 0 1 15 15v1a15 15 0 0
0 15 15"></path><path d="M260.5 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15
15"></path><g class="terminal">
+<path d="M290.5 51h10.0"></path><path d="M329.0 51h10.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="300.5" y="40"></rect><text
x="314.75" y="55">#</text></g><path d="M339.0 51a15 15 0 0 1 15 15v1a15 15 0 0
0 15 15"></path><path d="M339.0 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15
15"></path><g class="terminal">
+<path d="M369.0 51h10.0"></path><path d="M407.5 51h10.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="379.0" y="40"></rect><text
x="393.25" y="55">$</text></g><path d="M417.5 51h15"></path></g><path d="M
432.5 51 h 20 m 0 -10 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/source/text/sbasic/shared/fragments.xhp
b/source/text/sbasic/shared/fragments.xhp
index 74974886e..a0ab0b575 100644
--- a/source/text/sbasic/shared/fragments.xhp
+++ b/source/text/sbasic/shared/fragments.xhp
@@ -32,9 +32,10 @@
<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_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_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>
- <warning 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.
</warning>
+ <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>
+ <warning id="par_id391587571321063">When using <link
href="text/sbasic/shared/vbasupport.xhp" name ="Option VBASupport">Option
VBASupport 1</link>, <literal>Optional</literal> arguments with no default
value (<emph>= expression</emph>) are initialized according to their data type,
except if <literal>Variant</literal>.</warning>
</section>
<section id="array">
@@ -53,7 +54,7 @@
<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>
<bascode>
- <paragraph role="bascode" id="par_id3150985"
localize="false">{Currency|Date|Double|Integer|Long|Object|Single|String|Variant}</paragraph>
+ <paragraph role="bascode" id="par_id3150985"
localize="false">{Boolean|Byte|Currency|Date|Double|Integer|Long|Object|Single|String|Variant}</paragraph>
</bascode>
</section>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
