summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibreOļ¬ƒciant <LibreOfficiant@sfr.fr>2020-04-29 12:13:50 +0200
committerOlivier Hallot <olivier.hallot@libreoffice.org>2020-04-30 18:07:54 +0200
commit21fd17892ae4827f66d16a67a9c30c1854c5079d (patch)
treebfacb37e68872e729d34de61c4e88c34843a0a9d
parent5999ae5b939b73fbb194547a7bd134859a3c8a43 (diff)
tdf#131416 Basic syntax diagrams
- Add UNO objects in Dim, ReDim statements - Include std fragments in Dim, Redim, Type statements - "@" omission in Dim, ReDim Statements - Replace bugged example in Let statement Change-Id: I500e1dcaa605978981e3b96cb277664fe5916282 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/93131 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--source/media/helpimg/sbasic/Dim_statement.svg32
-rw-r--r--source/media/helpimg/sbasic/ReDim_statement.svg54
-rw-r--r--source/media/helpimg/sbasic/Type_statement.svg34
-rw-r--r--source/text/sbasic/shared/03090413.xhp2
-rw-r--r--source/text/sbasic/shared/03103700.xhp26
5 files changed, 82 insertions, 66 deletions
diff --git a/source/media/helpimg/sbasic/Dim_statement.svg b/source/media/helpimg/sbasic/Dim_statement.svg
index f2d06e0b2..31ac71596 100644
--- a/source/media/helpimg/sbasic/Dim_statement.svg
+++ b/source/media/helpimg/sbasic/Dim_statement.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="250" viewBox="0 0 713.5 250" width="713.5" xmlns="http://www.w3.org/2000/svg">
+<svg class="railroad-diagram" height="259" viewBox="0 0 705.0 259" width="705.0" xmlns="http://www.w3.org/2000/svg">
<g transform="translate(.5 .5)">
<style>/* <![CDATA[ */
svg.railroad-diagram {
@@ -35,20 +35,26 @@
<path d="M70.0 135h0.0"></path><path d="M149.5 135h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="70.0" y="124"></rect><text x="109.75" y="139">Private</text></g><path d="M149.5 135a15 15 0 0 0 15 -15v-54a15 15 0 0 1 15 -15"></path><path d="M40.0 51a15 15 0 0 1 15 15v96a15 15 0 0 0 15 15"></path><g class="terminal">
<path d="M70.0 177h4.25"></path><path d="M145.25 177h4.25"></path><rect height="22" rx="10" ry="10" width="71.0" x="74.25" y="166"></rect><text x="109.75" y="181">Public</text></g><path d="M149.5 177a15 15 0 0 0 15 -15v-96a15 15 0 0 1 15 -15"></path><path d="M40.0 51a15 15 0 0 1 15 15v138a15 15 0 0 0 15 15"></path><g class="terminal">
<path d="M70.0 219h4.25"></path><path d="M145.25 219h4.25"></path><rect height="22" rx="10" ry="10" width="71.0" x="74.25" y="208"></rect><text x="109.75" y="223">Static</text></g><path d="M149.5 219a15 15 0 0 0 15 -15v-138a15 15 0 0 1 15 -15"></path></g><path d="M179.5 51h10"></path><g>
-<path d="M189.5 51h0.0"></path><path d="M663.5 51h0.0"></path><path d="M189.5 51h15"></path><g>
-<path d="M204.5 51h0.0"></path><path d="M648.5 51h0.0"></path><g class="terminal">
+<path d="M189.5 51h0.0"></path><path d="M655.0 51h0.0"></path><path d="M189.5 51h15"></path><g>
+<path d="M204.5 51h0.0"></path><path d="M640.0 51h0.0"></path><g class="terminal">
<path d="M204.5 51h0.0"></path><path d="M292.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="88.0" x="204.5" y="40"></rect><text x="248.5" y="55">variable</text></g><path d="M292.5 51h10"></path><g>
-<path d="M302.5 51h0.0"></path><path d="M648.5 51h0.0"></path><path d="M302.5 51h30"></path><g>
-<path d="M332.5 51h0.0"></path><path d="M618.5 51h0.0"></path><g>
+<path d="M302.5 51h0.0"></path><path d="M640.0 51h0.0"></path><path d="M302.5 51h30"></path><g>
+<path d="M332.5 51h0.0"></path><path d="M610.0 51h0.0"></path><g>
<path d="M332.5 51h0.0"></path><path d="M455.0 51h0.0"></path><path d="M332.5 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
<path d="M362.5 20h62.5"></path></g><path d="M425.0 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M332.5 51h30"></path><g class="non-terminal">
<path d="M362.5 51h0.0"></path><path d="M425.0 51h0.0"></path><rect height="22" width="62.5" x="362.5" y="40"></rect><text x="393.75" y="55">array</text></g><path d="M425.0 51h30"></path></g><path d="M455.0 51h10"></path><g>
-<path d="M465.0 51h0.0"></path><path d="M618.5 51h0.0"></path><g class="terminal">
+<path d="M465.0 51h0.0"></path><path d="M610.0 51h0.0"></path><g class="terminal">
<path d="M465.0 51h0.0"></path><path d="M502.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="465.0" y="40"></rect><text x="483.5" y="55">As</text></g><path d="M502.0 51h10"></path><path d="M512.0 51h10"></path><g class="non-terminal">
-<path d="M522.0 51h0.0"></path><path d="M618.5 51h0.0"></path><rect height="22" width="96.5" x="522.0" y="40"></rect><text x="570.25" y="55">type-name</text></g></g></g><path d="M618.5 51h30"></path><path d="M302.5 51a15 15 0 0 1 15 15v32a15 15 0 0 0 15 15"></path><g>
-<path d="M332.5 113h32.75"></path><path d="M585.75 113h32.75"></path><g class="non-terminal">
-<path d="M365.25 113h0.0"></path><path d="M453.25 113h0.0"></path><rect height="22" width="88.0" x="365.25" y="102"></rect><text x="409.25" y="117">type-car</text></g><path d="M453.25 113h10"></path><g>
-<path d="M463.25 113h0.0"></path><path d="M585.75 113h0.0"></path><path d="M463.25 113a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
-<path d="M493.25 82h62.5"></path></g><path d="M555.75 82a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M463.25 113h30"></path><g class="non-terminal">
-<path d="M493.25 113h0.0"></path><path d="M555.75 113h0.0"></path><rect height="22" width="62.5" x="493.25" y="102"></rect><text x="524.5" y="117">array</text></g><path d="M555.75 113h30"></path></g></g><path d="M618.5 113a15 15 0 0 0 15 -15v-32a15 15 0 0 1 15 -15"></path></g></g><path d="M648.5 51h15"></path><path d="M204.5 51a15 15 0 0 0 -15 15v74a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M204.5 155h207.75"></path><path d="M440.75 155h207.75"></path><rect height="22" rx="10" ry="10" width="28.5" x="412.25" y="144"></rect><text x="426.5" y="159">,</text></g><path d="M648.5 155a15 15 0 0 0 15 -15v-74a15 15 0 0 0 -15 -15"></path></g><path d="M663.5 51h10"></path><path d="M 673.5 51 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg> \ No newline at end of file
+<path d="M522.0 51h0.0"></path><path d="M610.0 51h0.0"></path><rect height="22" width="88.0" x="522.0" y="40"></rect><text x="566.0" y="55">typename</text></g></g></g><path d="M610.0 51h30"></path><path d="M302.5 51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g>
+<path d="M332.5 93h22.0"></path><path d="M588.0 93h22.0"></path><g class="terminal">
+<path d="M354.5 93h0.0"></path><path d="M391.5 93h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="354.5" y="82"></rect><text x="373.0" y="97">As</text></g><path d="M391.5 93h10"></path><g>
+<path d="M401.5 93h0.0"></path><path d="M507.0 93h0.0"></path><path d="M401.5 93h30"></path><g>
+<path d="M431.5 93h45.5"></path></g><path d="M477.0 93h30"></path><path d="M401.5 93a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M431.5 124h0.0"></path><path d="M477.0 124h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="431.5" y="113"></rect><text x="454.25" y="128">New</text></g><path d="M477.0 124a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g><path d="M507.0 93h10"></path><g class="terminal">
+<path d="M517.0 93h0.0"></path><path d="M588.0 93h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="517.0" y="82"></rect><text x="552.5" y="97">object</text></g></g><path d="M610.0 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><path d="M302.5 51a15 15 0 0 1 15 15v105a15 15 0 0 0 15 15"></path><g>
+<path d="M332.5 186h45.5"></path><path d="M564.5 186h45.5"></path><g class="non-terminal">
+<path d="M378.0 186h0.0"></path><path d="M432.0 186h0.0"></path><rect height="22" width="54.0" x="378.0" y="175"></rect><text x="405.0" y="190">char</text></g><path d="M432.0 186h10"></path><g>
+<path d="M442.0 186h0.0"></path><path d="M564.5 186h0.0"></path><path d="M442.0 186a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
+<path d="M472.0 155h62.5"></path></g><path d="M534.5 155a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M442.0 186h30"></path><g class="non-terminal">
+<path d="M472.0 186h0.0"></path><path d="M534.5 186h0.0"></path><rect height="22" width="62.5" x="472.0" y="175"></rect><text x="503.25" y="190">array</text></g><path d="M534.5 186h30"></path></g></g><path d="M610.0 186a15 15 0 0 0 15 -15v-105a15 15 0 0 1 15 -15"></path></g></g><path d="M640.0 51h15"></path><path d="M204.5 51a15 15 0 0 0 -15 15v147a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M204.5 228h203.5"></path><path d="M436.5 228h203.5"></path><rect height="22" rx="10" ry="10" width="28.5" x="408.0" y="217"></rect><text x="422.25" y="232">,</text></g><path d="M640.0 228a15 15 0 0 0 15 -15v-147a15 15 0 0 0 -15 -15"></path></g><path d="M655.0 51h10"></path><path d="M 665.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/ReDim_statement.svg b/source/media/helpimg/sbasic/ReDim_statement.svg
index 5f26deaef..2a6768552 100644
--- a/source/media/helpimg/sbasic/ReDim_statement.svg
+++ b/source/media/helpimg/sbasic/ReDim_statement.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="206" viewBox="0 0 864.5 206" width="864.5" xmlns="http://www.w3.org/2000/svg">
+<svg class="railroad-diagram" height="259" viewBox="0 0 796.0 259" width="796.0" xmlns="http://www.w3.org/2000/svg">
<g transform="translate(.5 .5)">
<style>/* <![CDATA[ */
svg.railroad-diagram {
@@ -28,27 +28,31 @@
/* ]]> */
</style><g>
-<path d="M20 61v20m10 -20v20m-10 -10h20"></path></g><path d="M40 71h10"></path><g class="terminal">
-<path d="M50 71h0.0"></path><path d="M112.5 71h0.0"></path><rect height="22" rx="10" ry="10" width="62.5" x="50.0" y="60"></rect><text x="81.25" y="75">ReDim</text></g><path d="M112.5 71h10"></path><g>
-<path d="M122.5 71h0.0"></path><path d="M270.5 71h0.0"></path><path d="M122.5 71h30"></path><g>
-<path d="M152.5 71h88.0"></path></g><path d="M240.5 71h30"></path><path d="M122.5 71a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M152.5 102h0.0"></path><path d="M240.5 102h0.0"></path><rect height="22" rx="10" ry="10" width="88.0" x="152.5" y="91"></rect><text x="196.5" y="106">Preserve</text></g><path d="M240.5 102a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g><path d="M270.5 71h10"></path><g>
-<path d="M280.5 71h0.0"></path><path d="M814.5 71h0.0"></path><path d="M280.5 71h15"></path><g>
-<path d="M295.5 71h0.0"></path><path d="M799.5 71h0.0"></path><path d="M295.5 71a15 15 0 0 0 15 -15v-21a15 15 0 0 1 15 -15"></path><g>
-<path d="M325.5 20h444.0"></path></g><path d="M769.5 20a15 15 0 0 1 15 15v21a15 15 0 0 0 15 15"></path><path d="M295.5 71h30"></path><g>
-<path d="M325.5 71h0.0"></path><path d="M769.5 71h0.0"></path><g class="terminal">
-<path d="M325.5 71h0.0"></path><path d="M413.5 71h0.0"></path><rect height="22" rx="10" ry="10" width="88.0" x="325.5" y="60"></rect><text x="369.5" y="75">variable</text></g><path d="M413.5 71h10"></path><g>
-<path d="M423.5 71h0.0"></path><path d="M769.5 71h0.0"></path><path d="M423.5 71h30"></path><g>
-<path d="M453.5 71h0.0"></path><path d="M739.5 71h0.0"></path><g>
-<path d="M453.5 71h0.0"></path><path d="M576.0 71h0.0"></path><path d="M453.5 71a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
-<path d="M483.5 40h62.5"></path></g><path d="M546.0 40a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M453.5 71h30"></path><g class="non-terminal">
-<path d="M483.5 71h0.0"></path><path d="M546.0 71h0.0"></path><rect height="22" width="62.5" x="483.5" y="60"></rect><text x="514.75" y="75">array</text></g><path d="M546.0 71h30"></path></g><path d="M576.0 71h10"></path><g>
-<path d="M586.0 71h0.0"></path><path d="M739.5 71h0.0"></path><g class="terminal">
-<path d="M586.0 71h0.0"></path><path d="M623.0 71h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="586.0" y="60"></rect><text x="604.5" y="75">As</text></g><path d="M623.0 71h10"></path><path d="M633.0 71h10"></path><g class="non-terminal">
-<path d="M643.0 71h0.0"></path><path d="M739.5 71h0.0"></path><rect height="22" width="96.5" x="643.0" y="60"></rect><text x="691.25" y="75">type-name</text></g></g></g><path d="M739.5 71h30"></path><path d="M423.5 71a15 15 0 0 1 15 15v32a15 15 0 0 0 15 15"></path><g>
-<path d="M453.5 133h32.75"></path><path d="M706.75 133h32.75"></path><g class="non-terminal">
-<path d="M486.25 133h0.0"></path><path d="M574.25 133h0.0"></path><rect height="22" width="88.0" x="486.25" y="122"></rect><text x="530.25" y="137">type-car</text></g><path d="M574.25 133h10"></path><g>
-<path d="M584.25 133h0.0"></path><path d="M706.75 133h0.0"></path><path d="M584.25 133a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
-<path d="M614.25 102h62.5"></path></g><path d="M676.75 102a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M584.25 133h30"></path><g class="non-terminal">
-<path d="M614.25 133h0.0"></path><path d="M676.75 133h0.0"></path><rect height="22" width="62.5" x="614.25" y="122"></rect><text x="645.5" y="137">array</text></g><path d="M676.75 133h30"></path></g></g><path d="M739.5 133a15 15 0 0 0 15 -15v-32a15 15 0 0 1 15 -15"></path></g></g><path d="M769.5 71h30"></path></g><path d="M799.5 71h15"></path><path d="M295.5 71a15 15 0 0 0 -15 15v74a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M295.5 175h237.75"></path><path d="M561.75 175h237.75"></path><rect height="22" rx="10" ry="10" width="28.5" x="533.25" y="164"></rect><text x="547.5" y="179">,</text></g><path d="M799.5 175a15 15 0 0 0 15 -15v-74a15 15 0 0 0 -15 -15"></path></g><path d="M814.5 71h10"></path><path d="M 824.5 71 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 class="terminal">
+<path d="M50 51h0.0"></path><path d="M112.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="62.5" x="50.0" y="40"></rect><text x="81.25" y="55">ReDim</text></g><path d="M112.5 51h10"></path><g>
+<path d="M122.5 51h0.0"></path><path d="M270.5 51h0.0"></path><path d="M122.5 51h30"></path><g>
+<path d="M152.5 51h88.0"></path></g><path d="M240.5 51h30"></path><path d="M122.5 51a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M152.5 82h0.0"></path><path d="M240.5 82h0.0"></path><rect height="22" rx="10" ry="10" width="88.0" x="152.5" y="71"></rect><text x="196.5" y="86">Preserve</text></g><path d="M240.5 82a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g><path d="M270.5 51h10"></path><g>
+<path d="M280.5 51h0.0"></path><path d="M746.0 51h0.0"></path><path d="M280.5 51h15"></path><g>
+<path d="M295.5 51h0.0"></path><path d="M731.0 51h0.0"></path><g class="terminal">
+<path d="M295.5 51h0.0"></path><path d="M383.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="88.0" x="295.5" y="40"></rect><text x="339.5" y="55">variable</text></g><path d="M383.5 51h10"></path><g>
+<path d="M393.5 51h0.0"></path><path d="M731.0 51h0.0"></path><path d="M393.5 51h30"></path><g>
+<path d="M423.5 51h0.0"></path><path d="M701.0 51h0.0"></path><g>
+<path d="M423.5 51h0.0"></path><path d="M546.0 51h0.0"></path><path d="M423.5 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
+<path d="M453.5 20h62.5"></path></g><path d="M516.0 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M423.5 51h30"></path><g class="non-terminal">
+<path d="M453.5 51h0.0"></path><path d="M516.0 51h0.0"></path><rect height="22" width="62.5" x="453.5" y="40"></rect><text x="484.75" y="55">array</text></g><path d="M516.0 51h30"></path></g><path d="M546.0 51h10"></path><g>
+<path d="M556.0 51h0.0"></path><path d="M701.0 51h0.0"></path><g class="terminal">
+<path d="M556.0 51h0.0"></path><path d="M593.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="556.0" y="40"></rect><text x="574.5" y="55">As</text></g><path d="M593.0 51h10"></path><path d="M603.0 51h10"></path><g class="non-terminal">
+<path d="M613.0 51h0.0"></path><path d="M701.0 51h0.0"></path><rect height="22" width="88.0" x="613.0" y="40"></rect><text x="657.0" y="55">typename</text></g></g></g><path d="M701.0 51h30"></path><path d="M393.5 51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g>
+<path d="M423.5 93h22.0"></path><path d="M679.0 93h22.0"></path><g class="terminal">
+<path d="M445.5 93h0.0"></path><path d="M482.5 93h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="445.5" y="82"></rect><text x="464.0" y="97">As</text></g><path d="M482.5 93h10"></path><g>
+<path d="M492.5 93h0.0"></path><path d="M598.0 93h0.0"></path><path d="M492.5 93h30"></path><g>
+<path d="M522.5 93h45.5"></path></g><path d="M568.0 93h30"></path><path d="M492.5 93a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M522.5 124h0.0"></path><path d="M568.0 124h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="522.5" y="113"></rect><text x="545.25" y="128">New</text></g><path d="M568.0 124a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g><path d="M598.0 93h10"></path><g class="terminal">
+<path d="M608.0 93h0.0"></path><path d="M679.0 93h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="608.0" y="82"></rect><text x="643.5" y="97">object</text></g></g><path d="M701.0 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><path d="M393.5 51a15 15 0 0 1 15 15v105a15 15 0 0 0 15 15"></path><g>
+<path d="M423.5 186h45.5"></path><path d="M655.5 186h45.5"></path><g class="non-terminal">
+<path d="M469.0 186h0.0"></path><path d="M523.0 186h0.0"></path><rect height="22" width="54.0" x="469.0" y="175"></rect><text x="496.0" y="190">char</text></g><path d="M523.0 186h10"></path><g>
+<path d="M533.0 186h0.0"></path><path d="M655.5 186h0.0"></path><path d="M533.0 186a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
+<path d="M563.0 155h62.5"></path></g><path d="M625.5 155a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M533.0 186h30"></path><g class="non-terminal">
+<path d="M563.0 186h0.0"></path><path d="M625.5 186h0.0"></path><rect height="22" width="62.5" x="563.0" y="175"></rect><text x="594.25" y="190">array</text></g><path d="M625.5 186h30"></path></g></g><path d="M701.0 186a15 15 0 0 0 15 -15v-105a15 15 0 0 1 15 -15"></path></g></g><path d="M731.0 51h15"></path><path d="M295.5 51a15 15 0 0 0 -15 15v147a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M295.5 228h203.5"></path><path d="M527.5 228h203.5"></path><rect height="22" rx="10" ry="10" width="28.5" x="499.0" y="217"></rect><text x="513.25" y="232">,</text></g><path d="M731.0 228a15 15 0 0 0 15 -15v-147a15 15 0 0 0 -15 -15"></path></g><path d="M746.0 51h10"></path><path d="M 756.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/Type_statement.svg b/source/media/helpimg/sbasic/Type_statement.svg
index c1fab324a..14f850e9d 100644
--- a/source/media/helpimg/sbasic/Type_statement.svg
+++ b/source/media/helpimg/sbasic/Type_statement.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="248" viewBox="0 0 889.5 248" width="889.5" xmlns="http://www.w3.org/2000/svg">
+<svg class="railroad-diagram" height="248" viewBox="0 0 881.0 248" width="881.0" xmlns="http://www.w3.org/2000/svg">
<g transform="translate(.5 .5)">
<style>/* <![CDATA[ */
svg.railroad-diagram {
@@ -29,26 +29,26 @@
/* ]]> */
</style><g>
<path d="M20 41v20m10 -20v20m-10 -10h20"></path></g><path d="M40 51h10"></path><g>
-<path d="M50 51h0.0"></path><path d="M839.5 51h0.0"></path><g class="terminal">
+<path d="M50 51h0.0"></path><path d="M831.0 51h0.0"></path><g class="terminal">
<path d="M50.0 51h0.0"></path><path d="M104.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="50.0" y="40"></rect><text x="77.0" y="55">Type</text></g><path d="M104.0 51h10"></path><path d="M114.0 51h10"></path><g class="terminal">
<path d="M124.0 51h0.0"></path><path d="M229.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="105.0" x="124.0" y="40"></rect><text x="176.5" y="55">struc&#95;name</text></g><path d="M229.0 51h10"></path><path d="M239.0 51h10"></path><g>
-<path d="M249.0 51h0.0"></path><path d="M731.5 51h0.0"></path><path d="M249.0 51h15"></path><g>
-<path d="M264.0 51h0.0"></path><path d="M716.5 51h0.0"></path><g class="terminal">
+<path d="M249.0 51h0.0"></path><path d="M723.0 51h0.0"></path><path d="M249.0 51h15"></path><g>
+<path d="M264.0 51h0.0"></path><path d="M708.0 51h0.0"></path><g class="terminal">
<path d="M264.0 51h0.0"></path><path d="M360.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="96.5" x="264.0" y="40"></rect><text x="312.25" y="55">datafield</text></g><path d="M360.5 51h10"></path><g>
-<path d="M370.5 51h0.0"></path><path d="M716.5 51h0.0"></path><path d="M370.5 51h30"></path><g>
-<path d="M400.5 51h73.25"></path><path d="M613.25 51h73.25"></path><path d="M473.75 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
-<path d="M503.75 20h79.5"></path></g><path d="M583.25 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M473.75 51h30"></path><g class="terminal">
-<path d="M503.75 51h0.0"></path><path d="M583.25 51h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="503.75" y="40"></rect><text x="543.5" y="55">Variant</text></g><path d="M583.25 51h30"></path></g><path d="M686.5 51h30"></path><path d="M370.5 51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g>
-<path d="M400.5 93h0.0"></path><path d="M686.5 93h0.0"></path><g>
+<path d="M370.5 51h0.0"></path><path d="M708.0 51h0.0"></path><path d="M370.5 51h30"></path><g>
+<path d="M400.5 51h56.25"></path><path d="M621.75 51h56.25"></path><path d="M456.75 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
+<path d="M486.75 20h105.0"></path></g><path d="M591.75 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M456.75 51h30"></path><g class="terminal">
+<path d="M486.75 51h0.0"></path><path d="M591.75 51h0.0"></path><rect height="22" rx="10" ry="10" width="105.0" x="486.75" y="40"></rect><text x="539.25" y="55">As Variant</text></g><path d="M591.75 51h30"></path></g><path d="M678.0 51h30"></path><path d="M370.5 51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g>
+<path d="M400.5 93h0.0"></path><path d="M678.0 93h0.0"></path><g>
<path d="M400.5 93h0.0"></path><path d="M523.0 93h0.0"></path><path d="M400.5 93h30"></path><g>
<path d="M430.5 93h62.5"></path></g><path d="M493.0 93h30"></path><path d="M400.5 93a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="non-terminal">
<path d="M430.5 124h0.0"></path><path d="M493.0 124h0.0"></path><rect height="22" width="62.5" x="430.5" y="113"></rect><text x="461.75" y="128">array</text></g><path d="M493.0 124a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g><path d="M523.0 93h10"></path><g class="terminal">
<path d="M533.0 93h0.0"></path><path d="M570.0 93h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="533.0" y="82"></rect><text x="551.5" y="97">As</text></g><path d="M570.0 93h10"></path><path d="M580.0 93h10"></path><g class="non-terminal">
-<path d="M590.0 93h0.0"></path><path d="M686.5 93h0.0"></path><rect height="22" width="96.5" x="590.0" y="82"></rect><text x="638.25" y="97">type-name</text></g></g><path d="M686.5 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><path d="M370.5 51a15 15 0 0 1 15 15v85a15 15 0 0 0 15 15"></path><g>
-<path d="M400.5 166h32.75"></path><path d="M653.75 166h32.75"></path><g class="non-terminal">
-<path d="M433.25 166h0.0"></path><path d="M521.25 166h0.0"></path><rect height="22" width="88.0" x="433.25" y="155"></rect><text x="477.25" y="170">type-car</text></g><path d="M521.25 166h10"></path><g>
-<path d="M531.25 166h0.0"></path><path d="M653.75 166h0.0"></path><path d="M531.25 166h30"></path><g>
-<path d="M561.25 166h62.5"></path></g><path d="M623.75 166h30"></path><path d="M531.25 166a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="non-terminal">
-<path d="M561.25 197h0.0"></path><path d="M623.75 197h0.0"></path><rect height="22" width="62.5" x="561.25" y="186"></rect><text x="592.5" y="201">array</text></g><path d="M623.75 197a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g></g><path d="M686.5 166a15 15 0 0 0 15 -15v-85a15 15 0 0 1 15 -15"></path></g></g><path d="M716.5 51h15"></path><path d="M264.0 51a15 15 0 0 0 -15 15v147a15 15 0 0 0 15 15"></path><g>
-<path d="M264.0 228h452.5"></path></g><path d="M716.5 228a15 15 0 0 0 15 -15v-147a15 15 0 0 0 -15 -15"></path></g><path d="M731.5 51h10"></path><path d="M741.5 51h10"></path><g class="terminal">
-<path d="M751.5 51h0.0"></path><path d="M839.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="88.0" x="751.5" y="40"></rect><text x="795.5" y="55">End Type</text></g></g><path d="M839.5 51h10"></path><path d="M 849.5 51 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg> \ No newline at end of file
+<path d="M590.0 93h0.0"></path><path d="M678.0 93h0.0"></path><rect height="22" width="88.0" x="590.0" y="82"></rect><text x="634.0" y="97">typename</text></g></g><path d="M678.0 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><path d="M370.5 51a15 15 0 0 1 15 15v85a15 15 0 0 0 15 15"></path><g>
+<path d="M400.5 166h45.5"></path><path d="M632.5 166h45.5"></path><g class="non-terminal">
+<path d="M446.0 166h0.0"></path><path d="M500.0 166h0.0"></path><rect height="22" width="54.0" x="446.0" y="155"></rect><text x="473.0" y="170">char</text></g><path d="M500.0 166h10"></path><g>
+<path d="M510.0 166h0.0"></path><path d="M632.5 166h0.0"></path><path d="M510.0 166h30"></path><g>
+<path d="M540.0 166h62.5"></path></g><path d="M602.5 166h30"></path><path d="M510.0 166a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="non-terminal">
+<path d="M540.0 197h0.0"></path><path d="M602.5 197h0.0"></path><rect height="22" width="62.5" x="540.0" y="186"></rect><text x="571.25" y="201">array</text></g><path d="M602.5 197a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g></g><path d="M678.0 166a15 15 0 0 0 15 -15v-85a15 15 0 0 1 15 -15"></path></g></g><path d="M708.0 51h15"></path><path d="M264.0 51a15 15 0 0 0 -15 15v147a15 15 0 0 0 15 15"></path><g>
+<path d="M264.0 228h444.0"></path></g><path d="M708.0 228a15 15 0 0 0 15 -15v-147a15 15 0 0 0 -15 -15"></path></g><path d="M723.0 51h10"></path><path d="M733.0 51h10"></path><g class="terminal">
+<path d="M743.0 51h0.0"></path><path d="M831.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="88.0" x="743.0" y="40"></rect><text x="787.0" y="55">End Type</text></g></g><path d="M831.0 51h10"></path><path d="M 841.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/text/sbasic/shared/03090413.xhp b/source/text/sbasic/shared/03090413.xhp
index c77ca0528..806d8fed4 100644
--- a/source/text/sbasic/shared/03090413.xhp
+++ b/source/text/sbasic/shared/03090413.xhp
@@ -45,7 +45,7 @@
</bascode>
<embed href="text/sbasic/shared/fragments.xhp#array"/>
<embed href="text/sbasic/shared/fragments.xhp#typename"/>
- <embed href="text/sbasic/shared/fragments.xhp#typecar"/>
+ <embed href="text/sbasic/shared/fragments.xhp#char"/>
<note id="par_id351573639548645">A Type structure scope is that of the module it belongs to.</note>
<embed href="text/sbasic/shared/00000003.xhp#functexample"/>
<bascode>
diff --git a/source/text/sbasic/shared/03103700.xhp b/source/text/sbasic/shared/03103700.xhp
index fb7f33c3a..dbbfa1cb3 100644
--- a/source/text/sbasic/shared/03103700.xhp
+++ b/source/text/sbasic/shared/03103700.xhp
@@ -27,7 +27,6 @@
<body>
-
<section id="set">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154422">
<bookmark_value>Set statement</bookmark_value>
@@ -45,23 +44,30 @@
<image src="media/helpimg/sbasic/LetSet_statement.svg" id="img_id4156306484514"><alt xml-lang="en-US" id="alt_id15152796484514">Set Statement diagram</alt></image>
</paragraph>
<bascode>
-<paragraph id="par_id3154217" role="bascode" xml-lang="en-US">Set variable = object</paragraph>
+<paragraph id="par_id3154217" role="bascode" xml-lang="en-US">[Set] variable = [New] object</paragraph>
</bascode>
<paragraph id="hd_id3154685" role="heading" level="2" xml-lang="en-US">Parameters:</paragraph>
<paragraph id="par_id3156281" role="paragraph" xml-lang="en-US"> <emph>variable:</emph> a variable or a property that requires an object reference.</paragraph>
+ <paragraph role="paragraph" id="par_id211588241663649"> <emph>expression: </emph> A computable combination of terms such as a formula or an object property or method.</paragraph>
<paragraph id="par_id3159252" role="paragraph" xml-lang="en-US"> <emph>object:</emph> Object that the variable refers to.</paragraph>
-<paragraph id="par_idN10623" role="paragraph" xml-lang="en-US"> <emph>Nothing</emph> - Assign <emph>Nothing</emph> to a variable to remove a previous assignment.</paragraph>
-<note id="par_id101586014505785" xml-lang="en-US">The keyword <emph>Set</emph> is optional.</note>
+<paragraph id="par_idN10623" role="paragraph" xml-lang="en-US"> <literal>Nothing</literal> - Assign <literal>Nothing</literal> to a variable to remove a previous assignment.</paragraph>
+<note id="par_id101586014505785" xml-lang="en-US"><literal>Set</literal> keyword is optional. <literal>Nothing</literal> is the default value for objects.</note>
<paragraph id="hd_id3159153" role="heading" level="2" xml-lang="en-US">Example:</paragraph>
<bascode>
<paragraph id="par_idm1340836336" role="bascode" localize="false" xml-lang="en-US">Sub ExampleSet</paragraph>
-<paragraph id="par_idm1340835104" role="bascode" localize="false" xml-lang="en-US">Dim obj As Object</paragraph>
-<paragraph id="par_idm1340833872" role="bascode" localize="false" xml-lang="en-US"> Set obj = ActiveWindow</paragraph>
-<paragraph id="par_idm1340832624" role="bascode" localize="false" xml-lang="en-US"> Print obj.Name</paragraph>
-<paragraph id="par_idm1340831392" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
+<paragraph id="par_idm1340835104" role="bascode" localize="false" xml-lang="en-US"> Dim obj As Object</paragraph>
+<paragraph id="par_idm1340833872" role="bascode" localize="false" xml-lang="en-US"> Set obj = ThisComponent</paragraph>
+<paragraph id="par_idm1340832624" role="bascode" localize="false" xml-lang="en-US"> Print obj.Title</paragraph>
+<paragraph id="par_idm1341832624" role="bascode" localize="false" xml-lang="en-US"> </paragraph>
+<paragraph id="par_idm1340832625" role="bascode" localize="false" xml-lang="en-US"> obj = New com.sun.star.beans.PropertyValue</paragraph>
+<paragraph id="par_idm1340832626" role="bascode" localize="false" xml-lang="en-US"> With obj</paragraph>
+<paragraph id="par_idm1340832627" role="bascode" localize="false" xml-lang="en-US"> .Name = "key" : .Value = 594.34</paragraph>
+<paragraph id="par_idm1340832628" role="bascode" localize="false" xml-lang="en-US"> Print .Name, .Value</paragraph>
+<paragraph id="par_idm1340931399" role="bascode" localize="false" xml-lang="en-US"> End With</paragraph>
+<paragraph id="par_idm1340831399" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
</bascode>
-<warning id="par_id841586014507226" xml-lang="en-US">Use <emph>New</emph> only to assign a <link href="text/sbasic/shared/classmodule" name="ClassModule">class module</link> instance to a variable.</warning>
+<tip id="par_id841586014507226" xml-lang="en-US"><literal>New</literal> creates UNO objects or <link href="text/sbasic/shared/classmodule" name="ClassModule">class module</link> objects, before assigning it to a variable.</tip>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file