source/auxiliary/sbasic.tree | 5 -
source/media/helpimg/sbasic/Function_statement.svg | 57 ++++++++---------
source/media/helpimg/sbasic/Property-Get_statement.svg | 36 +++++-----
source/media/helpimg/sbasic/Property-Set_statement.svg | 37 +++++------
source/media/helpimg/sbasic/Sub_statement.svg | 45 ++++++-------
source/text/sbasic/shared/03090406.xhp | 45 ++++++++-----
source/text/sbasic/shared/03090409.xhp | 33 +++++----
source/text/sbasic/shared/03103450.xhp | 4 -
source/text/sbasic/shared/fragments.xhp | 2
source/text/sbasic/shared/property.xhp | 30 ++++++++
10 files changed, 165 insertions(+), 129 deletions(-)
New commits:
commit 115422426e5c514b05d8f64afa27141bb9ef1ae0
Author: LibreOfficiant <libreoffici...@sfr.fr>
AuthorDate: Mon Apr 27 14:11:43 2020 +0100
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon May 4 16:16:43 2020 +0200
tdf#131416 Basic Subroutines help pages
- Function, Property & Sub statements
- Public, Private are keywords, Global removed from diagrams:
- Global=Public as Basic libraries remain in memory
- Basic toc & index
Change-Id: If107f4d148b4da399dd03d1b18ea3da5454bb9ac
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/92784
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index c4012f039..17b9540a6 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -165,6 +165,7 @@
<topic
id="sbasic/text/sbasic/shared/03131000.xhp">GetSolarVersion Function</topic>
<topic
id="sbasic/text/sbasic/shared/03130700.xhp">GetSystemTicks Function</topic>
<topic id="sbasic/text/sbasic/shared/03020201.xhp">Get
Statement</topic>
+ <topic id="sbasic/text/sbasic/shared/03103450.xhp">Global
keyword</topic>
<topic
id="sbasic/text/sbasic/shared/03131900.xhp">GlobalScope</topic>
<topic
id="sbasic/text/sbasic/shared/03090301.xhp">GoSub...Return Statement</topic>
<topic id="sbasic/text/sbasic/shared/03090302.xhp">GoTo
Statement</topic>
@@ -236,7 +237,7 @@
<topic id="sbasic/text/sbasic/shared/03140008.xhp">PPmt
Function [VBA]</topic>
<topic id="sbasic/text/sbasic/shared/03010103.xhp">Print
Statement</topic>
<topic
id="sbasic/text/sbasic/shared/property.xhp">Property Statement</topic>
- <topic id="sbasic/text/sbasic/shared/03103400.xhp">Public
Statement</topic>
+ <topic id="sbasic/text/sbasic/shared/03103400.xhp">Public
keyword</topic>
<topic id="sbasic/text/sbasic/shared/03020204.xhp">Put
Statement</topic>
<topic id="sbasic/text/sbasic/shared/03140009.xhp">PV
Function [VBA]</topic>
<topic id="sbasic/text/sbasic/shared/03010304.xhp">QBColor
Function</topic>
@@ -271,7 +272,7 @@
<topic id="sbasic/text/sbasic/shared/03080401.xhp">Sqr
Function</topic>
<topic id="sbasic/text/sbasic/shared/03080400.xhp">Square
Root Calculation</topic>
<topic
id="sbasic/text/sbasic/shared/stardesktop.xhp">StarDesktop object</topic>
- <topic id="sbasic/text/sbasic/shared/03103500.xhp">Static
Statement</topic>
+ <topic id="sbasic/text/sbasic/shared/03103500.xhp">Static
keyword</topic>
<topic id="sbasic/text/sbasic/shared/03090408.xhp">Stop
Statement</topic>
<topic id="sbasic/text/sbasic/shared/03120403.xhp">StrComp
Function</topic>
<topic id="sbasic/text/sbasic/shared/03120103.xhp">Str
Function</topic>
diff --git a/source/media/helpimg/sbasic/Function_statement.svg
b/source/media/helpimg/sbasic/Function_statement.svg
index f3c0c7a2b..b5b30ca81 100644
--- a/source/media/helpimg/sbasic/Function_statement.svg
+++ b/source/media/helpimg/sbasic/Function_statement.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="188" viewBox="0 0 1187.0 188"
width="1187.0" xmlns="http://www.w3.org/2000/svg";>
+<svg class="railroad-diagram" height="208" viewBox="0 0 1178.5 208"
width="1178.5" xmlns="http://www.w3.org/2000/svg";>
<g transform="translate(.5 .5)">
<style>/* <![CDATA[ */
svg.railroad-diagram {
@@ -28,31 +28,30 @@
/* ]]> */
</style><g>
-<path d="M20 105v20m10 -20v20m-10 -10h20"></path></g><path d="M40
115h10"></path><g>
-<path d="M50 115h0.0"></path><path d="M1137.0 115h0.0"></path><g>
-<path d="M50.0 115h0.0"></path><path d="M249.5 115h0.0"></path><path d="M50.0
115a15 15 0 0 0 15 -15v-43a15 15 0 0 1 15 -15"></path><g>
-<path d="M80.0 42h139.5"></path></g><path d="M219.5 42a15 15 0 0 1 15 15v43a15
15 0 0 0 15 15"></path><path d="M50.0 115h30"></path><g>
-<path d="M80.0 115h0.0"></path><path d="M219.5 115h0.0"></path><path d="M80.0
115a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><g class="terminal">
-<path d="M110.0 73h4.25"></path><path d="M185.25 73h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="62"></rect><text
x="149.75" y="77">Global</text></g><path d="M189.5 73a15 15 0 0 1 15 15v12a15
15 0 0 0 15 15"></path><path d="M80.0 115h30"></path><g class="terminal">
-<path d="M110.0 115h4.25"></path><path d="M185.25 115h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="104"></rect><text
x="149.75" y="119">Public</text></g><path d="M189.5 115h30"></path><path
d="M80.0 115a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M110.0 157h0.0"></path><path d="M189.5 157h0.0"></path><rect
height="22" rx="10" ry="10" width="79.5" x="110.0" y="146"></rect><text
x="149.75" y="161">Private</text></g><path d="M189.5 157a15 15 0 0 0 15
-15v-12a15 15 0 0 1 15 -15"></path></g><path d="M219.5 115h30"></path></g><path
d="M249.5 115h10"></path><g class="terminal">
-<path d="M259.5 115h0.0"></path><path d="M347.5 115h0.0"></path><rect
height="22" rx="10" ry="10" width="88.0" x="259.5" y="104"></rect><text
x="303.5" y="119">Function</text></g><path d="M347.5 115h10"></path><path
d="M357.5 115h10"></path><g class="terminal">
-<path d="M367.5 115h0.0"></path><path d="M421.5 115h0.0"></path><rect
height="22" rx="10" ry="10" width="54.0" x="367.5" y="104"></rect><text
x="394.5" y="119">name</text></g><path d="M421.5 115h10"></path><g>
-<path d="M431.5 115h0.0"></path><path d="M880.0 115h0.0"></path><path
d="M431.5 115a15 15 0 0 0 15 -15v-54a15 15 0 0 1 15 -15"></path><g>
-<path d="M461.5 31h32.75"></path><path d="M817.25 31h32.75"></path><g
class="non-terminal">
-<path d="M494.25 31h0.0"></path><path d="M582.25 31h0.0"></path><rect
height="22" width="88.0" x="494.25" y="20"></rect><text x="538.25"
y="35">type-car</text></g><path d="M582.25 31h10"></path><path d="M592.25
31h10"></path><g class="terminal">
-<path d="M602.25 31h0.0"></path><path d="M630.75 31h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="602.25" y="20"></rect><text
x="616.5" y="35">(</text></g><path d="M630.75 31h10"></path><path d="M640.75
31h10"></path><g>
-<path d="M650.75 31h0.0"></path><path d="M768.75 31h0.0"></path><path
d="M650.75 31h15"></path><g class="non-terminal">
-<path d="M665.75 31h0.0"></path><path d="M753.75 31h0.0"></path><rect
height="22" width="88.0" x="665.75" y="20"></rect><text x="709.75"
y="35">argument</text></g><path d="M753.75 31h15"></path><path d="M665.75 31a15
15 0 0 0 -15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M665.75 73h29.75"></path><path d="M724.0 73h29.75"></path><rect
height="22" rx="10" ry="10" width="28.5" x="695.5" y="62"></rect><text
x="709.75" y="77">,</text></g><path d="M753.75 73a15 15 0 0 0 15 -15v-12a15 15
0 0 0 -15 -15"></path></g><path d="M768.75 31h10"></path><path d="M778.75
31h10"></path><g class="terminal">
-<path d="M788.75 31h0.0"></path><path d="M817.25 31h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="788.75" y="20"></rect><text
x="803.0" y="35">)</text></g></g><path d="M850.0 31a15 15 0 0 1 15 15v54a15 15
0 0 0 15 15"></path><path d="M431.5 115h30"></path><g>
-<path d="M461.5 115h0.0"></path><path d="M850.0 115h0.0"></path><g
class="terminal">
-<path d="M461.5 115h0.0"></path><path d="M490.0 115h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="461.5" y="104"></rect><text
x="475.75" y="119">(</text></g><path d="M490.0 115h10"></path><path d="M500.0
115h10"></path><g>
-<path d="M510.0 115h0.0"></path><path d="M628.0 115h0.0"></path><path
d="M510.0 115h15"></path><g class="non-terminal">
-<path d="M525.0 115h0.0"></path><path d="M613.0 115h0.0"></path><rect
height="22" width="88.0" x="525.0" y="104"></rect><text x="569.0"
y="119">argument</text></g><path d="M613.0 115h15"></path><path d="M525.0
115a15 15 0 0 0 -15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M525.0 157h29.75"></path><path d="M583.25 157h29.75"></path><rect
height="22" rx="10" ry="10" width="28.5" x="554.75" y="146"></rect><text
x="569.0" y="161">,</text></g><path d="M613.0 157a15 15 0 0 0 15 -15v-12a15 15
0 0 0 -15 -15"></path></g><path d="M628.0 115h10"></path><path d="M638.0
115h10"></path><g class="terminal">
-<path d="M648.0 115h0.0"></path><path d="M676.5 115h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="648.0" y="104"></rect><text
x="662.25" y="119">)</text></g><path d="M676.5 115h10"></path><path d="M686.5
115h10"></path><g class="terminal">
-<path d="M696.5 115h0.0"></path><path d="M733.5 115h0.0"></path><rect
height="22" rx="10" ry="10" width="37.0" x="696.5" y="104"></rect><text
x="715.0" y="119">As</text></g><path d="M733.5 115h10"></path><path d="M743.5
115h10"></path><g class="terminal">
-<path d="M753.5 115h0.0"></path><path d="M850.0 115h0.0"></path><rect
height="22" rx="10" ry="10" width="96.5" x="753.5" y="104"></rect><text
x="801.75" y="119">type-name</text></g></g><path d="M850.0
115h30"></path></g><path d="M880.0 115h10"></path><g class="non-terminal">
-<path d="M890.0 115h0.0"></path><path d="M995.0 115h0.0"></path><rect
height="22" width="105.0" x="890.0" y="104"></rect><text x="942.5"
y="119">statements</text></g><path d="M995.0 115h10"></path><path d="M1005.0
115h10"></path><g class="terminal">
-<path d="M1015.0 115h0.0"></path><path d="M1137.0 115h0.0"></path><rect
height="22" rx="10" ry="10" width="122.0" x="1015.0" y="104"></rect><text
x="1076.0" y="119">End Function</text></g></g><path d="M1137.0
115h10"></path><path d="M 1147.0 115 h 20 m -10 -10 v 20 m 10 -20 v
20"></path></g></svg>
\ No newline at end of file
+<path d="M20 41v20m10 -20v20m-10 -10h20"></path></g><path d="M40
51h10"></path><g>
+<path d="M50 51h0.0"></path><path d="M1128.5 51h0.0"></path><g>
+<path d="M50.0 51h0.0"></path><path d="M249.5 51h0.0"></path><path d="M50.0
51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
+<path d="M80.0 20h139.5"></path></g><path d="M219.5 20a15 15 0 0 1 15 15v1a15
15 0 0 0 15 15"></path><path d="M50.0 51h30"></path><g>
+<path d="M80.0 51h0.0"></path><path d="M219.5 51h0.0"></path><path d="M80.0
51h30"></path><g class="terminal">
+<path d="M110.0 51h4.25"></path><path d="M185.25 51h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="40"></rect><text
x="149.75" y="55">Public</text></g><path d="M189.5 51h30"></path><path d="M80.0
51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M110.0 93h0.0"></path><path d="M189.5 93h0.0"></path><rect
height="22" rx="10" ry="10" width="79.5" x="110.0" y="82"></rect><text
x="149.75" y="97">Private</text></g><path d="M189.5 93a15 15 0 0 0 15
-15v-12a15 15 0 0 1 15 -15"></path></g><path d="M219.5 51h30"></path></g><path
d="M249.5 51h10"></path><g class="terminal">
+<path d="M259.5 51h0.0"></path><path d="M347.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="88.0" x="259.5" y="40"></rect><text
x="303.5" y="55">Function</text></g><path d="M347.5 51h10"></path><path
d="M357.5 51h10"></path><g class="terminal">
+<path d="M367.5 51h0.0"></path><path d="M421.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="54.0" x="367.5" y="40"></rect><text
x="394.5" y="55">name</text></g><path d="M421.5 51h10"></path><g>
+<path d="M431.5 51h0.0"></path><path d="M871.5 51h0.0"></path><path d="M431.5
51h30"></path><g>
+<path d="M461.5 51h0.0"></path><path d="M841.5 51h0.0"></path><g
class="terminal">
+<path d="M461.5 51h0.0"></path><path d="M490.0 51h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="461.5" y="40"></rect><text
x="475.75" y="55">(</text></g><path d="M490.0 51h10"></path><path d="M500.0
51h10"></path><g>
+<path d="M510.0 51h0.0"></path><path d="M628.0 51h0.0"></path><path d="M510.0
51h15"></path><g class="non-terminal">
+<path d="M525.0 51h0.0"></path><path d="M613.0 51h0.0"></path><rect
height="22" width="88.0" x="525.0" y="40"></rect><text x="569.0"
y="55">argument</text></g><path d="M613.0 51h15"></path><path d="M525.0 51a15
15 0 0 0 -15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M525.0 93h29.75"></path><path d="M583.25 93h29.75"></path><rect
height="22" rx="10" ry="10" width="28.5" x="554.75" y="82"></rect><text
x="569.0" y="97">,</text></g><path d="M613.0 93a15 15 0 0 0 15 -15v-12a15 15 0
0 0 -15 -15"></path></g><path d="M628.0 51h10"></path><path d="M638.0
51h10"></path><g class="terminal">
+<path d="M648.0 51h0.0"></path><path d="M676.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="648.0" y="40"></rect><text
x="662.25" y="55">)</text></g><path d="M676.5 51h10"></path><path d="M686.5
51h10"></path><g class="terminal">
+<path d="M696.5 51h0.0"></path><path d="M733.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="37.0" x="696.5" y="40"></rect><text
x="715.0" y="55">As</text></g><path d="M733.5 51h10"></path><path d="M743.5
51h10"></path><g class="non-terminal">
+<path d="M753.5 51h0.0"></path><path d="M841.5 51h0.0"></path><rect
height="22" width="88.0" x="753.5" y="40"></rect><text x="797.5"
y="55">typename</text></g></g><path d="M841.5 51h30"></path><path d="M431.5
51a15 15 0 0 1 15 15v54a15 15 0 0 0 15 15"></path><g>
+<path d="M461.5 135h45.5"></path><path d="M796.0 135h45.5"></path><g
class="non-terminal">
+<path d="M507.0 135h0.0"></path><path d="M561.0 135h0.0"></path><rect
height="22" width="54.0" x="507.0" y="124"></rect><text x="534.0"
y="139">char</text></g><path d="M561.0 135h10"></path><path d="M571.0
135h10"></path><g class="terminal">
+<path d="M581.0 135h0.0"></path><path d="M609.5 135h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="581.0" y="124"></rect><text
x="595.25" y="139">(</text></g><path d="M609.5 135h10"></path><path d="M619.5
135h10"></path><g>
+<path d="M629.5 135h0.0"></path><path d="M747.5 135h0.0"></path><path
d="M629.5 135h15"></path><g class="non-terminal">
+<path d="M644.5 135h0.0"></path><path d="M732.5 135h0.0"></path><rect
height="22" width="88.0" x="644.5" y="124"></rect><text x="688.5"
y="139">argument</text></g><path d="M732.5 135h15"></path><path d="M644.5
135a15 15 0 0 0 -15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M644.5 177h29.75"></path><path d="M702.75 177h29.75"></path><rect
height="22" rx="10" ry="10" width="28.5" x="674.25" y="166"></rect><text
x="688.5" y="181">,</text></g><path d="M732.5 177a15 15 0 0 0 15 -15v-12a15 15
0 0 0 -15 -15"></path></g><path d="M747.5 135h10"></path><path d="M757.5
135h10"></path><g class="terminal">
+<path d="M767.5 135h0.0"></path><path d="M796.0 135h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="767.5" y="124"></rect><text
x="781.75" y="139">)</text></g></g><path d="M841.5 135a15 15 0 0 0 15
-15v-54a15 15 0 0 1 15 -15"></path></g><path d="M871.5 51h10"></path><g
class="terminal">
+<path d="M881.5 51h0.0"></path><path d="M986.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="105.0" x="881.5" y="40"></rect><text
x="934.0" y="55">statements</text></g><path d="M986.5 51h10"></path><path
d="M996.5 51h10"></path><g class="terminal">
+<path d="M1006.5 51h0.0"></path><path d="M1128.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="122.0" x="1006.5" y="40"></rect><text
x="1067.5" y="55">End Function</text></g></g><path d="M1128.5
51h10"></path><path d="M 1138.5 51 h 20 m -10 -10 v 20 m 10 -20 v
20"></path></g></svg>
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/Property-Get_statement.svg
b/source/media/helpimg/sbasic/Property-Get_statement.svg
index 6671ed85e..6bdff2db2 100644
--- a/source/media/helpimg/sbasic/Property-Get_statement.svg
+++ b/source/media/helpimg/sbasic/Property-Get_statement.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="166" viewBox="0 0 986.0 166"
width="986.0" xmlns="http://www.w3.org/2000/svg";>
+<svg class="railroad-diagram" height="124" viewBox="0 0 977.5 124"
width="977.5" xmlns="http://www.w3.org/2000/svg";>
<g transform="translate(.5 .5)">
<style>/* <![CDATA[ */
svg.railroad-diagram {
@@ -28,21 +28,19 @@
/* ]]> */
</style><g>
-<path d="M20 83v20m10 -20v20m-10 -10h20"></path></g><path d="M40
93h10"></path><g>
-<path d="M50 93h0.0"></path><path d="M936.0 93h0.0"></path><g>
-<path d="M50.0 93h0.0"></path><path d="M249.5 93h0.0"></path><path d="M50.0
93a15 15 0 0 0 15 -15v-43a15 15 0 0 1 15 -15"></path><g>
-<path d="M80.0 20h139.5"></path></g><path d="M219.5 20a15 15 0 0 1 15 15v43a15
15 0 0 0 15 15"></path><path d="M50.0 93h30"></path><g>
-<path d="M80.0 93h0.0"></path><path d="M219.5 93h0.0"></path><path d="M80.0
93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><g class="terminal">
-<path d="M110.0 51h4.25"></path><path d="M185.25 51h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="40"></rect><text
x="149.75" y="55">Global</text></g><path d="M189.5 51a15 15 0 0 1 15 15v12a15
15 0 0 0 15 15"></path><path d="M80.0 93h30"></path><g class="terminal">
-<path d="M110.0 93h4.25"></path><path d="M185.25 93h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="82"></rect><text
x="149.75" y="97">Public</text></g><path d="M189.5 93h30"></path><path d="M80.0
93a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M110.0 135h0.0"></path><path d="M189.5 135h0.0"></path><rect
height="22" rx="10" ry="10" width="79.5" x="110.0" y="124"></rect><text
x="149.75" y="139">Private</text></g><path d="M189.5 135a15 15 0 0 0 15
-15v-12a15 15 0 0 1 15 -15"></path></g><path d="M219.5 93h30"></path></g><path
d="M249.5 93h10"></path><g class="terminal">
-<path d="M259.5 93h0.0"></path><path d="M381.5 93h0.0"></path><rect
height="22" rx="10" ry="10" width="122.0" x="259.5" y="82"></rect><text
x="320.5" y="97">Property Get</text></g><path d="M381.5 93h10"></path><path
d="M391.5 93h10"></path><g class="terminal">
-<path d="M401.5 93h0.0"></path><path d="M455.5 93h0.0"></path><rect
height="22" rx="10" ry="10" width="54.0" x="401.5" y="82"></rect><text
x="428.5" y="97">name</text></g><path d="M455.5 93h10"></path><g>
-<path d="M465.5 93h0.0"></path><path d="M679.0 93h0.0"></path><path d="M465.5
93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><g>
-<path d="M495.5 51h32.75"></path><path d="M616.25 51h32.75"></path><g
class="non-terminal">
-<path d="M528.25 51h0.0"></path><path d="M616.25 51h0.0"></path><rect
height="22" width="88.0" x="528.25" y="40"></rect><text x="572.25"
y="55">type-car</text></g></g><path d="M649.0 51a15 15 0 0 1 15 15v12a15 15 0 0
0 15 15"></path><path d="M465.5 93h30"></path><g>
-<path d="M495.5 93h0.0"></path><path d="M649.0 93h0.0"></path><g
class="terminal">
-<path d="M495.5 93h0.0"></path><path d="M532.5 93h0.0"></path><rect
height="22" rx="10" ry="10" width="37.0" x="495.5" y="82"></rect><text
x="514.0" y="97">As</text></g><path d="M532.5 93h10"></path><path d="M542.5
93h10"></path><g class="terminal">
-<path d="M552.5 93h0.0"></path><path d="M649.0 93h0.0"></path><rect
height="22" rx="10" ry="10" width="96.5" x="552.5" y="82"></rect><text
x="600.75" y="97">type-name</text></g></g><path d="M649.0
93h30"></path></g><path d="M679.0 93h10"></path><g class="non-terminal">
-<path d="M689.0 93h0.0"></path><path d="M794.0 93h0.0"></path><rect
height="22" width="105.0" x="689.0" y="82"></rect><text x="741.5"
y="97">statements</text></g><path d="M794.0 93h10"></path><path d="M804.0
93h10"></path><g class="terminal">
-<path d="M814.0 93h0.0"></path><path d="M936.0 93h0.0"></path><rect
height="22" rx="10" ry="10" width="122.0" x="814.0" y="82"></rect><text
x="875.0" y="97">End Property</text></g></g><path d="M936.0 93h10"></path><path
d="M 946.0 93 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
+<path d="M20 41v20m10 -20v20m-10 -10h20"></path></g><path d="M40
51h10"></path><g>
+<path d="M50 51h0.0"></path><path d="M927.5 51h0.0"></path><g>
+<path d="M50.0 51h0.0"></path><path d="M249.5 51h0.0"></path><path d="M50.0
51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
+<path d="M80.0 20h139.5"></path></g><path d="M219.5 20a15 15 0 0 1 15 15v1a15
15 0 0 0 15 15"></path><path d="M50.0 51h30"></path><g>
+<path d="M80.0 51h0.0"></path><path d="M219.5 51h0.0"></path><path d="M80.0
51h30"></path><g class="terminal">
+<path d="M110.0 51h4.25"></path><path d="M185.25 51h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="40"></rect><text
x="149.75" y="55">Public</text></g><path d="M189.5 51h30"></path><path d="M80.0
51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M110.0 93h0.0"></path><path d="M189.5 93h0.0"></path><rect
height="22" rx="10" ry="10" width="79.5" x="110.0" y="82"></rect><text
x="149.75" y="97">Private</text></g><path d="M189.5 93a15 15 0 0 0 15
-15v-12a15 15 0 0 1 15 -15"></path></g><path d="M219.5 51h30"></path></g><path
d="M249.5 51h10"></path><g class="terminal">
+<path d="M259.5 51h0.0"></path><path d="M381.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="122.0" x="259.5" y="40"></rect><text
x="320.5" y="55">Property Get</text></g><path d="M381.5 51h10"></path><path
d="M391.5 51h10"></path><g class="terminal">
+<path d="M401.5 51h0.0"></path><path d="M455.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="54.0" x="401.5" y="40"></rect><text
x="428.5" y="55">name</text></g><path d="M455.5 51h10"></path><g>
+<path d="M465.5 51h0.0"></path><path d="M670.5 51h0.0"></path><path d="M465.5
51h30"></path><g>
+<path d="M495.5 51h0.0"></path><path d="M640.5 51h0.0"></path><g
class="terminal">
+<path d="M495.5 51h0.0"></path><path d="M532.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="37.0" x="495.5" y="40"></rect><text
x="514.0" y="55">As</text></g><path d="M532.5 51h10"></path><path d="M542.5
51h10"></path><g class="non-terminal">
+<path d="M552.5 51h0.0"></path><path d="M640.5 51h0.0"></path><rect
height="22" width="88.0" x="552.5" y="40"></rect><text x="596.5"
y="55">typename</text></g></g><path d="M640.5 51h30"></path><path d="M465.5
51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="non-terminal">
+<path d="M495.5 93h45.5"></path><path d="M595.0 93h45.5"></path><rect
height="22" width="54.0" x="541.0" y="82"></rect><text x="568.0"
y="97">char</text></g><path d="M640.5 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15
-15"></path></g><path d="M670.5 51h10"></path><g class="terminal">
+<path d="M680.5 51h0.0"></path><path d="M785.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="105.0" x="680.5" y="40"></rect><text
x="733.0" y="55">statements</text></g><path d="M785.5 51h10"></path><path
d="M795.5 51h10"></path><g class="terminal">
+<path d="M805.5 51h0.0"></path><path d="M927.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="122.0" x="805.5" y="40"></rect><text
x="866.5" y="55">End Property</text></g></g><path d="M927.5 51h10"></path><path
d="M 937.5 51 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/Property-Set_statement.svg
b/source/media/helpimg/sbasic/Property-Set_statement.svg
index 51235b174..f5de4045c 100644
--- a/source/media/helpimg/sbasic/Property-Set_statement.svg
+++ b/source/media/helpimg/sbasic/Property-Set_statement.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="166" viewBox="0 0 1049.0 166"
width="1049.0" xmlns="http://www.w3.org/2000/svg";>
+<svg class="railroad-diagram" height="124" viewBox="0 0 1049.0 124"
width="1049.0" xmlns="http://www.w3.org/2000/svg";>
<g transform="translate(.5 .5)">
<style>/* <![CDATA[ */
svg.railroad-diagram {
@@ -28,21 +28,20 @@
/* ]]> */
</style><g>
-<path d="M20 83v20m10 -20v20m-10 -10h20"></path></g><path d="M40
93h10"></path><g>
-<path d="M50 93h0.0"></path><path d="M999.0 93h0.0"></path><g>
-<path d="M50.0 93h0.0"></path><path d="M249.5 93h0.0"></path><path d="M50.0
93a15 15 0 0 0 15 -15v-43a15 15 0 0 1 15 -15"></path><g>
-<path d="M80.0 20h139.5"></path></g><path d="M219.5 20a15 15 0 0 1 15 15v43a15
15 0 0 0 15 15"></path><path d="M50.0 93h30"></path><g>
-<path d="M80.0 93h0.0"></path><path d="M219.5 93h0.0"></path><path d="M80.0
93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><g class="terminal">
-<path d="M110.0 51h4.25"></path><path d="M185.25 51h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="40"></rect><text
x="149.75" y="55">Global</text></g><path d="M189.5 51a15 15 0 0 1 15 15v12a15
15 0 0 0 15 15"></path><path d="M80.0 93h30"></path><g class="terminal">
-<path d="M110.0 93h4.25"></path><path d="M185.25 93h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="82"></rect><text
x="149.75" y="97">Public</text></g><path d="M189.5 93h30"></path><path d="M80.0
93a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M110.0 135h0.0"></path><path d="M189.5 135h0.0"></path><rect
height="22" rx="10" ry="10" width="79.5" x="110.0" y="124"></rect><text
x="149.75" y="139">Private</text></g><path d="M189.5 135a15 15 0 0 0 15
-15v-12a15 15 0 0 1 15 -15"></path></g><path d="M219.5 93h30"></path></g><path
d="M249.5 93h10"></path><g class="terminal">
-<path d="M259.5 93h0.0"></path><path d="M347.5 93h0.0"></path><rect
height="22" rx="10" ry="10" width="88.0" x="259.5" y="82"></rect><text
x="303.5" y="97">Property</text></g><path d="M347.5 93h10"></path><g>
-<path d="M357.5 93h0.0"></path><path d="M463.0 93h0.0"></path><path d="M357.5
93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><g class="terminal">
-<path d="M387.5 51h0.0"></path><path d="M433.0 51h0.0"></path><rect
height="22" rx="10" ry="10" width="45.5" x="387.5" y="40"></rect><text
x="410.25" y="55">Let</text></g><path d="M433.0 51a15 15 0 0 1 15 15v12a15 15 0
0 0 15 15"></path><path d="M357.5 93h30"></path><g class="terminal">
-<path d="M387.5 93h0.0"></path><path d="M433.0 93h0.0"></path><rect
height="22" rx="10" ry="10" width="45.5" x="387.5" y="82"></rect><text
x="410.25" y="97">Set</text></g><path d="M433.0 93h30"></path></g><path
d="M463.0 93h10"></path><g class="terminal">
-<path d="M473.0 93h0.0"></path><path d="M527.0 93h0.0"></path><rect
height="22" rx="10" ry="10" width="54.0" x="473.0" y="82"></rect><text
x="500.0" y="97">name</text></g><path d="M527.0 93h10"></path><path d="M537.0
93h10"></path><g class="terminal">
-<path d="M547.0 93h0.0"></path><path d="M575.5 93h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="547.0" y="82"></rect><text
x="561.25" y="97">(</text></g><path d="M575.5 93h10"></path><path d="M585.5
93h10"></path><g class="non-terminal">
-<path d="M595.5 93h0.0"></path><path d="M683.5 93h0.0"></path><rect
height="22" width="88.0" x="595.5" y="82"></rect><text x="639.5"
y="97">argument</text></g><path d="M683.5 93h10"></path><path d="M693.5
93h10"></path><g class="terminal">
-<path d="M703.5 93h0.0"></path><path d="M732.0 93h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="703.5" y="82"></rect><text
x="717.75" y="97">)</text></g><path d="M732.0 93h10"></path><path d="M742.0
93h10"></path><g class="non-terminal">
-<path d="M752.0 93h0.0"></path><path d="M857.0 93h0.0"></path><rect
height="22" width="105.0" x="752.0" y="82"></rect><text x="804.5"
y="97">statements</text></g><path d="M857.0 93h10"></path><path d="M867.0
93h10"></path><g class="terminal">
-<path d="M877.0 93h0.0"></path><path d="M999.0 93h0.0"></path><rect
height="22" rx="10" ry="10" width="122.0" x="877.0" y="82"></rect><text
x="938.0" y="97">End Property</text></g></g><path d="M999.0 93h10"></path><path
d="M 1009.0 93 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
+<path d="M20 41v20m10 -20v20m-10 -10h20"></path></g><path d="M40
51h10"></path><g>
+<path d="M50 51h0.0"></path><path d="M999.0 51h0.0"></path><g>
+<path d="M50.0 51h0.0"></path><path d="M249.5 51h0.0"></path><path d="M50.0
51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
+<path d="M80.0 20h139.5"></path></g><path d="M219.5 20a15 15 0 0 1 15 15v1a15
15 0 0 0 15 15"></path><path d="M50.0 51h30"></path><g>
+<path d="M80.0 51h0.0"></path><path d="M219.5 51h0.0"></path><path d="M80.0
51h30"></path><g class="terminal">
+<path d="M110.0 51h4.25"></path><path d="M185.25 51h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="40"></rect><text
x="149.75" y="55">Public</text></g><path d="M189.5 51h30"></path><path d="M80.0
51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M110.0 93h0.0"></path><path d="M189.5 93h0.0"></path><rect
height="22" rx="10" ry="10" width="79.5" x="110.0" y="82"></rect><text
x="149.75" y="97">Private</text></g><path d="M189.5 93a15 15 0 0 0 15
-15v-12a15 15 0 0 1 15 -15"></path></g><path d="M219.5 51h30"></path></g><path
d="M249.5 51h10"></path><g class="terminal">
+<path d="M259.5 51h0.0"></path><path d="M347.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="88.0" x="259.5" y="40"></rect><text
x="303.5" y="55">Property</text></g><path d="M347.5 51h10"></path><g>
+<path d="M357.5 51h0.0"></path><path d="M463.0 51h0.0"></path><path d="M357.5
51h30"></path><g class="terminal">
+<path d="M387.5 51h0.0"></path><path d="M433.0 51h0.0"></path><rect
height="22" rx="10" ry="10" width="45.5" x="387.5" y="40"></rect><text
x="410.25" y="55">Set</text></g><path d="M433.0 51h30"></path><path d="M357.5
51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M387.5 93h0.0"></path><path d="M433.0 93h0.0"></path><rect
height="22" rx="10" ry="10" width="45.5" x="387.5" y="82"></rect><text
x="410.25" y="97">Let</text></g><path d="M433.0 93a15 15 0 0 0 15 -15v-12a15 15
0 0 1 15 -15"></path></g><path d="M463.0 51h10"></path><g class="terminal">
+<path d="M473.0 51h0.0"></path><path d="M527.0 51h0.0"></path><rect
height="22" rx="10" ry="10" width="54.0" x="473.0" y="40"></rect><text
x="500.0" y="55">name</text></g><path d="M527.0 51h10"></path><path d="M537.0
51h10"></path><g class="terminal">
+<path d="M547.0 51h0.0"></path><path d="M575.5 51h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="547.0" y="40"></rect><text
x="561.25" y="55">(</text></g><path d="M575.5 51h10"></path><path d="M585.5
51h10"></path><g class="non-terminal">
+<path d="M595.5 51h0.0"></path><path d="M683.5 51h0.0"></path><rect
height="22" width="88.0" x="595.5" y="40"></rect><text x="639.5"
y="55">argument</text></g><path d="M683.5 51h10"></path><path d="M693.5
51h10"></path><g class="terminal">
+<path d="M703.5 51h0.0"></path><path d="M732.0 51h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="703.5" y="40"></rect><text
x="717.75" y="55">)</text></g><path d="M732.0 51h10"></path><path d="M742.0
51h10"></path><g class="terminal">
+<path d="M752.0 51h0.0"></path><path d="M857.0 51h0.0"></path><rect
height="22" rx="10" ry="10" width="105.0" x="752.0" y="40"></rect><text
x="804.5" y="55">statements</text></g><path d="M857.0 51h10"></path><path
d="M867.0 51h10"></path><g class="terminal">
+<path d="M877.0 51h0.0"></path><path d="M999.0 51h0.0"></path><rect
height="22" rx="10" ry="10" width="122.0" x="877.0" y="40"></rect><text
x="938.0" y="55">End Property</text></g></g><path d="M999.0 51h10"></path><path
d="M 1009.0 51 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/Sub_statement.svg
b/source/media/helpimg/sbasic/Sub_statement.svg
index f1e46ae8d..b5b47356e 100644
--- a/source/media/helpimg/sbasic/Sub_statement.svg
+++ b/source/media/helpimg/sbasic/Sub_statement.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="166" viewBox="0 0 968.5 166"
width="968.5" xmlns="http://www.w3.org/2000/svg";>
+<svg class="railroad-diagram" height="144" viewBox="0 0 968.5 144"
width="968.5" xmlns="http://www.w3.org/2000/svg";>
<g transform="translate(.5 .5)">
<style>/* <![CDATA[ */
svg.railroad-diagram {
@@ -28,25 +28,24 @@
/* ]]> */
</style><g>
-<path d="M20 83v20m10 -20v20m-10 -10h20"></path></g><path d="M40
93h10"></path><g>
-<path d="M50 93h0.0"></path><path d="M918.5 93h0.0"></path><g>
-<path d="M50.0 93h0.0"></path><path d="M249.5 93h0.0"></path><path d="M50.0
93a15 15 0 0 0 15 -15v-43a15 15 0 0 1 15 -15"></path><g>
-<path d="M80.0 20h139.5"></path></g><path d="M219.5 20a15 15 0 0 1 15 15v43a15
15 0 0 0 15 15"></path><path d="M50.0 93h30"></path><g>
-<path d="M80.0 93h0.0"></path><path d="M219.5 93h0.0"></path><path d="M80.0
93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><g class="terminal">
-<path d="M110.0 51h4.25"></path><path d="M185.25 51h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="40"></rect><text
x="149.75" y="55">Global</text></g><path d="M189.5 51a15 15 0 0 1 15 15v12a15
15 0 0 0 15 15"></path><path d="M80.0 93h30"></path><g class="terminal">
-<path d="M110.0 93h4.25"></path><path d="M185.25 93h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="82"></rect><text
x="149.75" y="97">Public</text></g><path d="M189.5 93h30"></path><path d="M80.0
93a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M110.0 135h0.0"></path><path d="M189.5 135h0.0"></path><rect
height="22" rx="10" ry="10" width="79.5" x="110.0" y="124"></rect><text
x="149.75" y="139">Private</text></g><path d="M189.5 135a15 15 0 0 0 15
-15v-12a15 15 0 0 1 15 -15"></path></g><path d="M219.5 93h30"></path></g><path
d="M249.5 93h10"></path><g class="terminal">
-<path d="M259.5 93h0.0"></path><path d="M305.0 93h0.0"></path><rect
height="22" rx="10" ry="10" width="45.5" x="259.5" y="82"></rect><text
x="282.25" y="97">Sub</text></g><path d="M305.0 93h10"></path><path d="M315.0
93h10"></path><g class="terminal">
-<path d="M325.0 93h0.0"></path><path d="M379.0 93h0.0"></path><rect
height="22" rx="10" ry="10" width="54.0" x="325.0" y="82"></rect><text
x="352.0" y="97">name</text></g><path d="M379.0 93h10"></path><g>
-<path d="M389.0 93h0.0"></path><path d="M704.0 93h0.0"></path><path d="M389.0
93a15 15 0 0 0 15 -15v-21a15 15 0 0 1 15 -15"></path><g>
-<path d="M419.0 42h255.0"></path></g><path d="M674.0 42a15 15 0 0 1 15
15v21a15 15 0 0 0 15 15"></path><path d="M389.0 93h30"></path><g>
-<path d="M419.0 93h0.0"></path><path d="M674.0 93h0.0"></path><g
class="terminal">
-<path d="M419.0 93h0.0"></path><path d="M447.5 93h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="419.0" y="82"></rect><text
x="433.25" y="97">(</text></g><path d="M447.5 93h10"></path><g>
-<path d="M457.5 93h0.0"></path><path d="M635.5 93h0.0"></path><path d="M457.5
93a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
-<path d="M487.5 62h118.0"></path></g><path d="M605.5 62a15 15 0 0 1 15 15v1a15
15 0 0 0 15 15"></path><path d="M457.5 93h30"></path><g>
-<path d="M487.5 93h0.0"></path><path d="M605.5 93h0.0"></path><path d="M487.5
93h15"></path><g class="non-terminal">
-<path d="M502.5 93h0.0"></path><path d="M590.5 93h0.0"></path><rect
height="22" width="88.0" x="502.5" y="82"></rect><text x="546.5"
y="97">argument</text></g><path d="M590.5 93h15"></path><path d="M502.5 93a15
15 0 0 0 -15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M502.5 135h29.75"></path><path d="M560.75 135h29.75"></path><rect
height="22" rx="10" ry="10" width="28.5" x="532.25" y="124"></rect><text
x="546.5" y="139">,</text></g><path d="M590.5 135a15 15 0 0 0 15 -15v-12a15 15
0 0 0 -15 -15"></path></g><path d="M605.5 93h30"></path></g><path d="M635.5
93h10"></path><g class="terminal">
-<path d="M645.5 93h0.0"></path><path d="M674.0 93h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="645.5" y="82"></rect><text
x="659.75" y="97">)</text></g></g><path d="M674.0 93h30"></path></g><path
d="M704.0 93h10"></path><g class="non-terminal">
-<path d="M714.0 93h0.0"></path><path d="M819.0 93h0.0"></path><rect
height="22" width="105.0" x="714.0" y="82"></rect><text x="766.5"
y="97">statements</text></g><path d="M819.0 93h10"></path><path d="M829.0
93h10"></path><g class="terminal">
-<path d="M839.0 93h0.0"></path><path d="M918.5 93h0.0"></path><rect
height="22" rx="10" ry="10" width="79.5" x="839.0" y="82"></rect><text
x="878.75" y="97">End Sub</text></g></g><path d="M918.5 93h10"></path><path
d="M 928.5 93 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
+<path d="M20 61v20m10 -20v20m-10 -10h20"></path></g><path d="M40
71h10"></path><g>
+<path d="M50 71h0.0"></path><path d="M918.5 71h0.0"></path><g>
+<path d="M50.0 71h0.0"></path><path d="M249.5 71h0.0"></path><path d="M50.0
71a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
+<path d="M80.0 40h139.5"></path></g><path d="M219.5 40a15 15 0 0 1 15 15v1a15
15 0 0 0 15 15"></path><path d="M50.0 71h30"></path><g>
+<path d="M80.0 71h0.0"></path><path d="M219.5 71h0.0"></path><path d="M80.0
71h30"></path><g class="terminal">
+<path d="M110.0 71h4.25"></path><path d="M185.25 71h4.25"></path><rect
height="22" rx="10" ry="10" width="71.0" x="114.25" y="60"></rect><text
x="149.75" y="75">Public</text></g><path d="M189.5 71h30"></path><path d="M80.0
71a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M110.0 113h0.0"></path><path d="M189.5 113h0.0"></path><rect
height="22" rx="10" ry="10" width="79.5" x="110.0" y="102"></rect><text
x="149.75" y="117">Private</text></g><path d="M189.5 113a15 15 0 0 0 15
-15v-12a15 15 0 0 1 15 -15"></path></g><path d="M219.5 71h30"></path></g><path
d="M249.5 71h10"></path><g class="terminal">
+<path d="M259.5 71h0.0"></path><path d="M305.0 71h0.0"></path><rect
height="22" rx="10" ry="10" width="45.5" x="259.5" y="60"></rect><text
x="282.25" y="75">Sub</text></g><path d="M305.0 71h10"></path><path d="M315.0
71h10"></path><g class="terminal">
+<path d="M325.0 71h0.0"></path><path d="M379.0 71h0.0"></path><rect
height="22" rx="10" ry="10" width="54.0" x="325.0" y="60"></rect><text
x="352.0" y="75">name</text></g><path d="M379.0 71h10"></path><g>
+<path d="M389.0 71h0.0"></path><path d="M704.0 71h0.0"></path><path d="M389.0
71a15 15 0 0 0 15 -15v-21a15 15 0 0 1 15 -15"></path><g>
+<path d="M419.0 20h255.0"></path></g><path d="M674.0 20a15 15 0 0 1 15
15v21a15 15 0 0 0 15 15"></path><path d="M389.0 71h30"></path><g>
+<path d="M419.0 71h0.0"></path><path d="M674.0 71h0.0"></path><g
class="terminal">
+<path d="M419.0 71h0.0"></path><path d="M447.5 71h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="419.0" y="60"></rect><text
x="433.25" y="75">(</text></g><path d="M447.5 71h10"></path><g>
+<path d="M457.5 71h0.0"></path><path d="M635.5 71h0.0"></path><path d="M457.5
71a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
+<path d="M487.5 40h118.0"></path></g><path d="M605.5 40a15 15 0 0 1 15 15v1a15
15 0 0 0 15 15"></path><path d="M457.5 71h30"></path><g>
+<path d="M487.5 71h0.0"></path><path d="M605.5 71h0.0"></path><path d="M487.5
71h15"></path><g class="non-terminal">
+<path d="M502.5 71h0.0"></path><path d="M590.5 71h0.0"></path><rect
height="22" width="88.0" x="502.5" y="60"></rect><text x="546.5"
y="75">argument</text></g><path d="M590.5 71h15"></path><path d="M502.5 71a15
15 0 0 0 -15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M502.5 113h29.75"></path><path d="M560.75 113h29.75"></path><rect
height="22" rx="10" ry="10" width="28.5" x="532.25" y="102"></rect><text
x="546.5" y="117">,</text></g><path d="M590.5 113a15 15 0 0 0 15 -15v-12a15 15
0 0 0 -15 -15"></path></g><path d="M605.5 71h30"></path></g><path d="M635.5
71h10"></path><g class="terminal">
+<path d="M645.5 71h0.0"></path><path d="M674.0 71h0.0"></path><rect
height="22" rx="10" ry="10" width="28.5" x="645.5" y="60"></rect><text
x="659.75" y="75">)</text></g></g><path d="M674.0 71h30"></path></g><path
d="M704.0 71h10"></path><g class="non-terminal">
+<path d="M714.0 71h0.0"></path><path d="M819.0 71h0.0"></path><rect
height="22" width="105.0" x="714.0" y="60"></rect><text x="766.5"
y="75">statements</text></g><path d="M819.0 71h10"></path><path d="M829.0
71h10"></path><g class="terminal">
+<path d="M839.0 71h0.0"></path><path d="M918.5 71h0.0"></path><rect
height="22" rx="10" ry="10" width="79.5" x="839.0" y="60"></rect><text
x="878.75" y="75">End Sub</text></g></g><path d="M918.5 71h10"></path><path
d="M 928.5 71 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03090406.xhp
b/source/text/sbasic/shared/03090406.xhp
index 415b4f7bd..eb10a54c3 100644
--- a/source/text/sbasic/shared/03090406.xhp
+++ b/source/text/sbasic/shared/03090406.xhp
@@ -27,33 +27,44 @@
<body>
-
<section id="function">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153346">
<bookmark_value>Function statement</bookmark_value>
</bookmark>
-
<paragraph id="hd_id3153346" role="heading" level="1" xml-lang="en-US"><link
href="text/sbasic/shared/03090406.xhp" name="Function Statement">Function
Statement</link></paragraph>
<paragraph id="par_id3159158" role="paragraph" xml-lang="en-US">Defines a
subroutine that can be used as an expression to determine a return
type.</paragraph>
</section>
-<paragraph id="hd_id3145316" role="heading" level="2"
xml-lang="en-US">Syntax</paragraph>
-<paragraph id="par_id3148944" role="paragraph" xml-lang="en-US">see
Parameter</paragraph>
+<section id="TwinMethods">
+<note id="par_id661588586825434"><literal>Sub</literal> or
<literal>Function</literal> statements are similar methods, without
distinction. They receive parameters by reference allowing them to be modified.
%PRODUCTNAME Basic compiler accepts their respective syntax to be used
interchangeably.</note>
+</section>
-<paragraph id="hd_id3154760" role="heading" level="2"
xml-lang="en-US">Parameters:</paragraph>
-<paragraph id="par_id3156344" role="paragraph"
xml-lang="en-US">Syntax</paragraph>
-<paragraph id="par_id3149457" role="paragraph" xml-lang="en-US">Function
Name[(VarName1 [As Type][, VarName2 [As Type][,...]]]) [As Type]</paragraph>
-<paragraph id="par_id3153360" role="paragraph" xml-lang="en-US">statement
block</paragraph>
-<paragraph id="par_id3148797" role="paragraph" xml-lang="en-US">[Exit
Function]</paragraph>
-<paragraph id="par_id3145419" role="paragraph" xml-lang="en-US">statement
block</paragraph>
-<paragraph id="par_id3150449" role="paragraph" xml-lang="en-US">End
Function</paragraph>
-<paragraph id="par_id3156281" role="paragraph"
xml-lang="en-US">Parameter</paragraph>
-<paragraph id="par_id3153193" role="paragraph" xml-lang="en-US">
<emph>Name:</emph> Name of the subroutine to contain the value returned by the
function.</paragraph>
-<paragraph id="par_id3147229" role="paragraph" xml-lang="en-US">
<emph>VarName:</emph> Parameter to be passed to the subroutine.</paragraph>
-<paragraph id="par_id3147287" role="paragraph" xml-lang="en-US">
<emph>Type:</emph> Type-declaration keyword.</paragraph>
+<embed href="text/sbasic/shared/00000003.xhp#functsyntax"/>
+<paragraph role="paragraph" id="par_id971588473588701">
+ <image src="media/helpimg/sbasic/Function_statement.svg"
id="img_id4156296484514"><alt xml-lang="en-US"
id="alt_id15152796484514">Function Statement diagram</alt></image></paragraph>
+<bascode>
+ <paragraph role="bascode" id="bas_id151588427099190"
localize="false">[Private | Public] Function Name[char] (argument1 [As Type][,
argument2[char][,...]]) [As typename]</paragraph>
+ <paragraph role="bascode" id="bas_id541588427401158" xml-lang="en-US">
statements</paragraph>
+ <paragraph role="bascode" id="bas_id981588427406211" localize="false">
[Exit Function]</paragraph>
+ <paragraph role="bascode" id="bas_id631588427410583" xml-lang="en-US">
statements</paragraph>
+ <paragraph role="bascode" id="bas_id581588427417085" localize="false">End
Function</paragraph>
+</bascode>
-<paragraph id="hd_id3163710" role="heading" level="2"
xml-lang="en-US">Example:</paragraph>
+<embed href="text/sbasic/shared/00000003.xhp#functparameters"/>
+<section id="RoutineScope">
+ <paragraph role="paragraph" id="par_id81588429476557"> <emph>scope:</emph>
Function default scope is <literal>Public</literal>. A
<literal>Private</literal> scope denotes a module internal routine, not
intended to be used from other modules.</paragraph>
+</section>
+
+<paragraph id="par_id3153193" role="paragraph" xml-lang="en-US">
<emph>name:</emph> Name of the subroutine to contain the value returned by the
function.</paragraph>
+<paragraph id="par_id3147229" role="paragraph" xml-lang="en-US">
<emph>arguments:</emph> Parameters to be passed to the subroutine.</paragraph>
+
+<embed href="text/sbasic/shared/fragments.xhp#argument"/>
+<embed href="text/sbasic/shared/fragments.xhp#typename"/>
+<embed href="text/sbasic/shared/fragments.xhp#char"/>
+
+<section id="BasicExamples">
+<h2 id="hd_id3163710" xml-lang="en-US">Examples:</h2>
<bascode>
<paragraph id="par_idm1340981728" role="bascode" localize="false"
xml-lang="en-US">Sub ExampleExit</paragraph>
<paragraph id="par_idm1340980496" role="bascode" localize="false"
xml-lang="en-US">Dim sReturn As String</paragraph>
@@ -80,6 +91,8 @@
<paragraph id="par_idm1340952352" role="bascode" localize="false"
xml-lang="en-US"> LinSearch = iCount</paragraph>
<paragraph id="par_idm1340951120" role="bascode" localize="false"
xml-lang="en-US">End Function</paragraph>
</bascode>
+</section>
+
</body>
</helpdocument>
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03090409.xhp
b/source/text/sbasic/shared/03090409.xhp
index 08348414d..9dbe58789 100644
--- a/source/text/sbasic/shared/03090409.xhp
+++ b/source/text/sbasic/shared/03090409.xhp
@@ -27,35 +27,38 @@
<body>
-
<section id="sub">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147226">
<bookmark_value>Sub statement</bookmark_value>
</bookmark>
-
<paragraph id="hd_id3147226" role="heading" level="1" xml-lang="en-US"><link
href="text/sbasic/shared/03090409.xhp" name="Sub Statement">Sub
Statement</link></paragraph>
<paragraph id="par_id3153311" role="paragraph" xml-lang="en-US">Defines a
subroutine.</paragraph>
</section>
+<embed href="text/sbasic/shared/03090406.xhp#TwinMethods"/>
-<paragraph id="hd_id3149416" role="heading" level="2"
xml-lang="en-US">Syntax</paragraph>
+<embed href="text/sbasic/shared/00000003.xhp#functsyntax"/>
+<paragraph role="paragraph" id="par_id971587473488701">
+ <image src="media/helpimg/sbasic/Sub_statement.svg"
id="img_id4156296484514"><alt xml-lang="en-US" id="alt_id15152796484514">Sub
Statement diagram</alt></image>
+</paragraph>
<bascode>
-<paragraph id="par_idm1341163696" role="bascode" localize="false"
xml-lang="en-US">Sub Name[(VarName1 [As Type][, VarName2 [As
Type][,...]])]</paragraph>
-<paragraph id="par_id3147530" role="bascode" xml-lang="en-US">statement
block</paragraph>
+<paragraph id="par_idm1341163696" role="bascode" localize="false"
xml-lang="en-US">[Private | Public] Sub name[(argument1 [As typename][,
argument2[char][,...]])]</paragraph>
+<paragraph id="par_id3147530" role="bascode" xml-lang="en-US"> '
statements</paragraph>
+ <paragraph id="par_id3247530" role="bascode" localize="false"> [Exit
Sub]</paragraph>
+ <paragraph id="par_id3148530" role="bascode" xml-lang="en-US"> '
statements</paragraph>
<paragraph id="par_idm1341160656" role="bascode" localize="false"
xml-lang="en-US">End Sub</paragraph>
</bascode>
-<paragraph id="hd_id3153525" role="heading" level="2"
xml-lang="en-US">Parameters:</paragraph>
-<paragraph id="par_id3150792" role="paragraph" xml-lang="en-US">
<emph>Name:</emph> Name of the subroutine.</paragraph>
-<paragraph id="par_id3154138" role="paragraph" xml-lang="en-US">
<emph>VarName:</emph> Parameter that you want to pass to the
subroutine.</paragraph>
-<paragraph id="par_id3154908" role="paragraph" xml-lang="en-US">
<emph>Type:</emph> Type-declaration key word.</paragraph>
+<embed href="text/sbasic/shared/00000003.xhp#functparameters"/>
+<paragraph id="par_id3150792" role="paragraph" xml-lang="en-US">
<emph>name:</emph> Name of the subroutine.</paragraph>
+<paragraph id="par_id3154138" role="paragraph" xml-lang="en-US">
<emph>arguments:</emph> Optional parameters that you want to pass to the
subroutine.</paragraph>
+
+<embed href="text/sbasic/shared/fragments.xhp#argument"/>
+<embed href="text/sbasic/shared/fragments.xhp#typename"/>
+<embed href="text/sbasic/shared/fragments.xhp#char"/>
+
+<embed href="text/sbasic/shared/03090406.xhp#BasicExamples"/>
-<paragraph id="hd_id3153770" role="heading" level="2"
xml-lang="en-US">Example:</paragraph>
-<bascode>
-<paragraph id="par_idm1341148592" role="bascode" localize="false"
xml-lang="en-US">Sub Example</paragraph>
-<paragraph id="par_idN1063F" role="bascode" xml-lang="en-US"> ' some
statements</paragraph>
-<paragraph id="par_idm1341146032" role="bascode" localize="false"
xml-lang="en-US">End Sub</paragraph>
-</bascode>
</body>
</helpdocument>
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03103450.xhp
b/source/text/sbasic/shared/03103450.xhp
index 67f74ca6f..b2c0e5144 100644
--- a/source/text/sbasic/shared/03103450.xhp
+++ b/source/text/sbasic/shared/03103450.xhp
@@ -30,11 +30,11 @@
<section id="global">
<bookmark xml-lang="en-US" branch="index" id="bm_id3159201">
- <bookmark_value>Global statement</bookmark_value>
+ <bookmark_value>Global keyword</bookmark_value>
</bookmark>
-<paragraph id="hd_id3159201" role="heading" level="1" xml-lang="en-US"><link
href="text/sbasic/shared/03103450.xhp" name="Global Statement">Global
Statement</link></paragraph>
+<paragraph id="hd_id3159201" role="heading" level="1" xml-lang="en-US"><link
href="text/sbasic/shared/03103450.xhp" name="Global keyword">Global
keyword</link></paragraph>
<paragraph id="par_id3149177" role="paragraph" xml-lang="en-US">Dimensions a
variable or an array at the global level (that is, not within a subroutine or
function), so that the variable and the array are valid in all libraries and
modules for the current session.</paragraph>
</section>
diff --git a/source/text/sbasic/shared/fragments.xhp
b/source/text/sbasic/shared/fragments.xhp
index ad22ea519..ffbf564c5 100644
--- a/source/text/sbasic/shared/fragments.xhp
+++ b/source/text/sbasic/shared/fragments.xhp
@@ -59,7 +59,7 @@
</section>
<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>
+ <h4 id="hd_id231587046013459"><variable id="charh4"><link
href="text/sbasic/shared/fragments.xhp" name="type declaration characters
fragment"></link></variable>char 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">{ % |
& | ! | # | $ | @ }</paragraph>
diff --git a/source/text/sbasic/shared/property.xhp
b/source/text/sbasic/shared/property.xhp
index 1138716fd..31a489715 100644
--- a/source/text/sbasic/shared/property.xhp
+++ b/source/text/sbasic/shared/property.xhp
@@ -27,15 +27,39 @@
<bookmark branch="index" id="N0181">
<bookmark_value>Property statement</bookmark_value>
</bookmark>
+
<h1 id="N0182">Property Statement</h1>
<paragraph role="paragraph" id="N0183">A property, also called field or
attribute, characterizes a given object or piece of information. Properties can
be used to control access to data. It is common use to include instructions at
setting or reading time of properties. Code can vary from simple assignment to
complex context dependant routines. Using <emph>Get</emph>, <emph>Let</emph> or
<emph>Set</emph> accessers enforces properties' consistency when
necessary.</paragraph>
<warning id="N0184">This statement requires <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>
- <h2 id="N0185">Syntax</h2>
+
+ <embed href="text/sbasic/shared/00000003.xhp#functsyntax"/>
+ <paragraph role="paragraph" id="par_id971587473488701">
+ <image src="media/helpimg/sbasic/Property-Get_statement.svg"
id="img_id4156296484514"><alt xml-lang="en-US"
id="alt_id15152796484514">Property Get Statement diagram</alt></image>
+ </paragraph>
<bascode>
- <paragraph role="bascode" localize="false" id="N0186">[Global |
Private | Public] Property [Get | Let | Set] propName[([Optional [ByRef |
ByVal]]value As Typename)] [As Typename]</paragraph>
+ <paragraph role="bascode" localize="false" id="N0185">[Private |
Public] Property Get name[char | As typename]</paragraph>
+ <paragraph role="bascode" localize="false" id="N0185b">End
Property</paragraph>
+ </bascode>
+
+ <paragraph role="paragraph" id="par_id972787473488701">
+ <image src="media/helpimg/sbasic/Property-Set_statement.svg"
id="img_id4156296484514"><alt xml-lang="en-US"
id="alt_id15152796484514">Property Set Statement diagram</alt></image>
+ </paragraph>
+ <bascode>
+ <paragraph role="bascode" localize="false" id="N0186">[Private |
Public] Property [Let | Set] name[char] [([Optional [ByRef | ByVal]]value[char
| As typename])] [As typename]</paragraph>
<paragraph role="bascode" localize="false" id="N0187">End
Property</paragraph>
</bascode>
- <h2 id="N0188">Examples</h2>
+
+ <embed href="text/sbasic/shared/00000003.xhp#functparameters"/>
+ <paragraph role="paragraph" id="par_id941588582710020"> <emph>name:
</emph>The property name.</paragraph>
+
+ <paragraph id="par_id3147229" role="paragraph" xml-lang="en-US">
<emph>argument:</emph> Value to be passed to the <literal>Property</literal>
setter routine.</paragraph>
+ <note id="par_id301588583826717"><literal>Property</literal> setters
often use a single argument. Multiple arguments are equally accepted.</note>
+
+ <embed href="text/sbasic/shared/fragments.xhp#argument"/>
+ <embed href="text/sbasic/shared/fragments.xhp#typename"/>
+ <embed href="text/sbasic/shared/fragments.xhp#char"/>
+
+ <h2 id="N0188">Examples</h2>
<bascode>
<paragraph role="bascode" localize="false" id="N0189">Option
Compatible</paragraph>
<paragraph role="bascode" localize="false" id="N0190">Sub
Main</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
