[Libreoffice-commits] help.git: Package_html_media.mk source/media source/text
LibreOfficiant (via logerrit)
logerrit at kemper.freedesktop.org
Thu Apr 9 17:45:05 UTC 2020
Package_html_media.mk | 2
source/media/helpimg/sbasic/Call_statement.svg | 596 +++++++++++++++++++++--
source/media/helpimg/sbasic/LetSet_statement.svg | 46 +
source/media/helpimg/sbasic/Resume_statement.svg | 39 +
source/text/sbasic/shared/03103100.xhp | 15
source/text/sbasic/shared/03103700.xhp | 23
6 files changed, 674 insertions(+), 47 deletions(-)
New commits:
commit 45cd0c0b21653c0f8947c77d7d93ca7a01a47cc2
Author: LibreOfficiant <LibreOfficiant at sfr.fr>
AuthorDate: Sat Apr 4 15:35:47 2020 +0100
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Thu Apr 9 19:44:44 2020 +0200
tdf131416 Let/Set statements joint Syntax diagram
- Call diagram update to better reflect optional parms
- Resume diagram added by anticipation, in order to prevent merge conflict with patch #91712
Change-Id: I82d3ea4ac5af581462e919696a53d91868b6fdd2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/91709
Tested-by: Olivier Hallot <olivier.hallot at libreoffice.org>
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/Package_html_media.mk b/Package_html_media.mk
index 4e8aefc3d..2b5ab4042 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -108,6 +108,8 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
helpimg/smzb8.png \
helpimg/smzb9.png \
helpimg/sbasic/Call_statement.svg \
+ helpimg/sbasic/LetSet_statement.svg \
+ helpimg/sbasic/Resume_statement.svg \
helpimg/scalc/coordinates-to-polar-01.svg \
helpimg/starmath/harpoon.svg \
helpimg/starmath/wideharpoon.svg \
diff --git a/source/media/helpimg/sbasic/Call_statement.svg b/source/media/helpimg/sbasic/Call_statement.svg
index 3dd36a029..d604e3d83 100644
--- a/source/media/helpimg/sbasic/Call_statement.svg
+++ b/source/media/helpimg/sbasic/Call_statement.svg
@@ -1,6 +1,61 @@
-<svg class="railroad-diagram" height="228" viewBox="0 0 727.0 228" width="727.0" xmlns="http://www.w3.org/2000/svg">
-<g transform="translate(.5 .5)">
-<style>/* <![CDATA[ */
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ class="railroad-diagram"
+ height="270"
+ viewBox="0 0 727.0 270"
+ width="727.0"
+ version="1.1"
+ id="svg598"
+ sodipodi:docname="Call_statement.svg"
+ inkscape:export-filename="D:\Call_statement.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+ <metadata
+ id="metadata604">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs602" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1511"
+ inkscape:window-height="735"
+ id="namedview600"
+ showgrid="false"
+ inkscape:zoom="2.4621733"
+ inkscape:cx="474.26814"
+ inkscape:cy="135"
+ inkscape:window-x="306"
+ inkscape:window-y="204"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg598" />
+ <g
+ transform="translate(.5 .5)"
+ id="g596">
+ <style
+ id="style308">/* <![CDATA[ */
svg.railroad-diagram {
background-color:transparent;
}
@@ -27,32 +82,509 @@
}
/* ]]> */
-</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="M677.0 51h0.0"></path><g>
-<path d="M50.0 51h0.0"></path><path d="M164.0 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 20h54.0"></path></g><path d="M134.0 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M50.0 51h30"></path><g class="terminal">
-<path d="M80.0 51h0.0"></path><path d="M134.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="80.0" y="40"></rect><text x="107.0" y="55">Call</text></g><path d="M134.0 51h30"></path></g><path d="M164.0 51h10"></path><g class="non-terminal">
-<path d="M174.0 51h0.0"></path><path d="M228.0 51h0.0"></path><rect height="22" width="54.0" x="174.0" y="40"></rect><text x="201.0" y="55">name</text></g><path d="M228.0 51h10"></path><g>
-<path d="M238.0 51h0.0"></path><path d="M677.0 51h0.0"></path><path d="M238.0 51h30"></path><g>
-<path d="M268.0 51h0.0"></path><path d="M647.0 51h0.0"></path><g class="terminal">
-<path d="M268.0 51h0.0"></path><path d="M296.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="268.0" y="40"></rect><text x="282.25" y="55">(</text></g><path d="M296.5 51h10"></path><path d="M306.5 51h10"></path><g>
-<path d="M316.5 51h0.0"></path><path d="M598.5 51h0.0"></path><path d="M316.5 51h15"></path><g>
-<path d="M331.5 51h0.0"></path><path d="M583.5 51h0.0"></path><g>
-<path d="M331.5 51h0.0"></path><path d="M511.0 51h0.0"></path><path d="M331.5 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
-<path d="M361.5 20h119.5"></path></g><path d="M481.0 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M331.5 51h30"></path><g>
-<path d="M361.5 51h0.0"></path><path d="M481.0 51h0.0"></path><g class="non-terminal">
-<path d="M361.5 51h0.0"></path><path d="M424.0 51h0.0"></path><rect height="22" width="62.5" x="361.5" y="40"></rect><text x="392.75" y="55">param</text></g><path d="M424.0 51h10"></path><path d="M434.0 51h10"></path><g class="terminal">
-<path d="M444.0 51h0.0"></path><path d="M481.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="444.0" y="40"></rect><text x="462.5" y="55">:=</text></g></g><path d="M481.0 51h30"></path></g><path d="M511.0 51h10"></path><g class="non-terminal">
-<path d="M521.0 51h0.0"></path><path d="M583.5 51h0.0"></path><rect height="22" width="62.5" x="521.0" y="40"></rect><text x="552.25" y="55">value</text></g></g><path d="M583.5 51h15"></path><path d="M331.5 51a15 15 0 0 0 -15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M331.5 93h111.75"></path><path d="M471.75 93h111.75"></path><rect height="22" rx="10" ry="10" width="28.5" x="443.25" y="82"></rect><text x="457.5" y="97">,</text></g><path d="M583.5 93a15 15 0 0 0 15 -15v-12a15 15 0 0 0 -15 -15"></path></g><path d="M598.5 51h10"></path><path d="M608.5 51h10"></path><g class="terminal">
-<path d="M618.5 51h0.0"></path><path d="M647.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="618.5" y="40"></rect><text x="632.75" y="55">)</text></g></g><path d="M647.0 51h30"></path><path d="M238.0 51a15 15 0 0 1 15 15v74a15 15 0 0 0 15 15"></path><g>
-<path d="M268.0 155h48.5"></path><path d="M598.5 155h48.5"></path><path d="M316.5 155h15"></path><g>
-<path d="M331.5 155h0.0"></path><path d="M583.5 155h0.0"></path><g>
-<path d="M331.5 155h0.0"></path><path d="M511.0 155h0.0"></path><path d="M331.5 155a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
-<path d="M361.5 124h119.5"></path></g><path d="M481.0 124a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M331.5 155h30"></path><g>
-<path d="M361.5 155h0.0"></path><path d="M481.0 155h0.0"></path><g class="non-terminal">
-<path d="M361.5 155h0.0"></path><path d="M424.0 155h0.0"></path><rect height="22" width="62.5" x="361.5" y="144"></rect><text x="392.75" y="159">param</text></g><path d="M424.0 155h10"></path><path d="M434.0 155h10"></path><g class="terminal">
-<path d="M444.0 155h0.0"></path><path d="M481.0 155h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="444.0" y="144"></rect><text x="462.5" y="159">:=</text></g></g><path d="M481.0 155h30"></path></g><path d="M511.0 155h10"></path><g class="non-terminal">
-<path d="M521.0 155h0.0"></path><path d="M583.5 155h0.0"></path><rect height="22" width="62.5" x="521.0" y="144"></rect><text x="552.25" y="159">value</text></g></g><path d="M583.5 155h15"></path><path d="M331.5 155a15 15 0 0 0 -15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M331.5 197h111.75"></path><path d="M471.75 197h111.75"></path><rect height="22" rx="10" ry="10" width="28.5" x="443.25" y="186"></rect><text x="457.5" y="201">,</text></g><path d="M583.5 197a15 15 0 0 0 15 -15v-12a15 15 0 0 0 -15 -15"></path></g><path d="M647.0 155a15 15 0 0 0 15 -15v-74a15 15 0 0 1 15 -15"></path></g></g><path d="M677.0 51h10"></path><path d="M 687.0 51 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
+</style>
+ <g
+ id="g312">
+ <path
+ d="M20 41v20m10 -20v20m-10 -10h20"
+ id="path310" />
+ </g>
+ <path
+ d="M40 51h10"
+ id="path314" />
+ <g
+ id="g590">
+ <path
+ d="M50 51h0.0"
+ id="path316" />
+ <path
+ d="M677.0 51h0.0"
+ id="path318" />
+ <g
+ id="g346">
+ <path
+ d="M50.0 51h0.0"
+ id="path320" />
+ <path
+ d="M164.0 51h0.0"
+ id="path322" />
+ <path
+ d="M50.0 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"
+ id="path324" />
+ <g
+ id="g328">
+ <path
+ d="M80.0 20h54.0"
+ id="path326" />
+ </g>
+ <path
+ d="M134.0 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"
+ id="path330" />
+ <path
+ d="M50.0 51h30"
+ id="path332" />
+ <g
+ class="terminal"
+ id="g342">
+ <path
+ d="M80.0 51h0.0"
+ id="path334" />
+ <path
+ d="M134.0 51h0.0"
+ id="path336" />
+ <rect
+ height="22"
+ rx="10"
+ ry="10"
+ width="54.0"
+ x="80.0"
+ y="40"
+ id="rect338" />
+ <text
+ x="107.0"
+ y="55"
+ id="text340">Call</text>
+ </g>
+ <path
+ d="M134.0 51h30"
+ id="path344" />
+ </g>
+ <path
+ d="M164.0 51h10"
+ id="path348" />
+ <g
+ class="non-terminal"
+ id="g358">
+ <path
+ d="M174.0 51h0.0"
+ id="path350" />
+ <path
+ d="M228.0 51h0.0"
+ id="path352" />
+ <rect
+ height="22"
+ width="54.0"
+ x="174.0"
+ y="40"
+ id="rect354" />
+ <text
+ x="201.0"
+ y="55"
+ id="text356">name</text>
+ </g>
+ <path
+ d="M228.0 51h10"
+ id="path360" />
+ <g
+ id="g588">
+ <path
+ d="M238.0 51h0.0"
+ id="path362" />
+ <path
+ d="M677.0 51h0.0"
+ id="path364" />
+ <path
+ d="M238.0 51h30"
+ id="path366" />
+ <g
+ id="g490">
+ <path
+ d="M268.0 51h0.0"
+ id="path368" />
+ <path
+ d="M647.0 51h0.0"
+ id="path370" />
+ <g
+ class="terminal"
+ id="g380">
+ <path
+ d="M268.0 51h0.0"
+ id="path372" />
+ <path
+ d="M296.5 51h0.0"
+ id="path374" />
+ <rect
+ height="22"
+ rx="10"
+ ry="10"
+ width="28.5"
+ x="268.0"
+ y="40"
+ id="rect376" />
+ <text
+ x="282.25"
+ y="55"
+ id="text378">(</text>
+ </g>
+ <path
+ d="M296.5 51h10"
+ id="path382" />
+ <path
+ d="M306.5 51h10"
+ id="path384" />
+ <g
+ id="g474">
+ <path
+ d="M316.5 51h0.0"
+ id="path386" />
+ <path
+ d="M598.5 51h0.0"
+ id="path388" />
+ <path
+ d="M316.5 51h15"
+ id="path390" />
+ <g
+ id="g456">
+ <path
+ d="M331.5 51h0.0"
+ id="path392" />
+ <path
+ d="M583.5 51h0.0"
+ id="path394" />
+ <g
+ id="g442">
+ <path
+ d="M331.5 51h0.0"
+ id="path396" />
+ <path
+ d="M511.0 51h0.0"
+ id="path398" />
+ <path
+ d="M331.5 51h30"
+ id="path400" />
+ <g
+ id="g404">
+ <path
+ d="M361.5 51h119.5"
+ id="path402" />
+ </g>
+ <path
+ d="M481.0 51h30"
+ id="path406" />
+ <path
+ d="M331.5 51a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"
+ id="path408" />
+ <g
+ id="g438">
+ <path
+ d="M361.5 82h0.0"
+ id="path410" />
+ <path
+ d="M481.0 82h0.0"
+ id="path412" />
+ <g
+ class="non-terminal"
+ id="g422">
+ <path
+ d="M361.5 82h0.0"
+ id="path414" />
+ <path
+ d="M424.0 82h0.0"
+ id="path416" />
+ <rect
+ height="22"
+ width="62.5"
+ x="361.5"
+ y="71"
+ id="rect418" />
+ <text
+ x="392.75"
+ y="86"
+ id="text420">param</text>
+ </g>
+ <path
+ d="M424.0 82h10"
+ id="path424" />
+ <path
+ d="M434.0 82h10"
+ id="path426" />
+ <g
+ class="terminal"
+ id="g436">
+ <path
+ d="M444.0 82h0.0"
+ id="path428" />
+ <path
+ d="M481.0 82h0.0"
+ id="path430" />
+ <rect
+ height="22"
+ rx="10"
+ ry="10"
+ width="37.0"
+ x="444.0"
+ y="71"
+ id="rect432" />
+ <text
+ x="462.5"
+ y="86"
+ id="text434">:=</text>
+ </g>
+ </g>
+ <path
+ d="M481.0 82a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"
+ id="path440" />
+ </g>
+ <path
+ d="M511.0 51h10"
+ id="path444" />
+ <g
+ class="non-terminal"
+ id="g454">
+ <path
+ d="M521.0 51h0.0"
+ id="path446" />
+ <path
+ d="M583.5 51h0.0"
+ id="path448" />
+ <rect
+ height="22"
+ width="62.5"
+ x="521.0"
+ y="40"
+ id="rect450" />
+ <text
+ x="552.25"
+ y="55"
+ id="text452">value</text>
+ </g>
+ </g>
+ <path
+ d="M583.5 51h15"
+ id="path458" />
+ <path
+ d="M331.5 51a15 15 0 0 0 -15 15v43a15 15 0 0 0 15 15"
+ id="path460" />
+ <g
+ class="terminal"
+ id="g470">
+ <path
+ d="M331.5 124h111.75"
+ id="path462" />
+ <path
+ d="M471.75 124h111.75"
+ id="path464" />
+ <rect
+ height="22"
+ rx="10"
+ ry="10"
+ width="28.5"
+ x="443.25"
+ y="113"
+ id="rect466" />
+ <text
+ x="457.5"
+ y="128"
+ id="text468">,</text>
+ </g>
+ <path
+ d="M583.5 124a15 15 0 0 0 15 -15v-43a15 15 0 0 0 -15 -15"
+ id="path472" />
+ </g>
+ <path
+ d="M598.5 51h10"
+ id="path476" />
+ <path
+ d="M608.5 51h10"
+ id="path478" />
+ <g
+ class="terminal"
+ id="g488">
+ <path
+ d="M618.5 51h0.0"
+ id="path480" />
+ <path
+ d="M647.0 51h0.0"
+ id="path482" />
+ <rect
+ height="22"
+ rx="10"
+ ry="10"
+ width="28.5"
+ x="618.5"
+ y="40"
+ id="rect484" />
+ <text
+ x="632.75"
+ y="55"
+ id="text486">)</text>
+ </g>
+ </g>
+ <path
+ d="M647.0 51h30"
+ id="path492" />
+ <path
+ d="M238.0 51a15 15 0 0 1 15 15v85a15 15 0 0 0 15 15"
+ id="path494" />
+ <g
+ id="g584">
+ <path
+ d="M268.0 166h48.5"
+ id="path496" />
+ <path
+ d="M598.5 166h48.5"
+ id="path498" />
+ <path
+ d="M316.5 166h15"
+ id="path500" />
+ <g
+ id="g566">
+ <path
+ d="M331.5 166h0.0"
+ id="path502" />
+ <path
+ d="M583.5 166h0.0"
+ id="path504" />
+ <g
+ id="g552">
+ <path
+ d="M331.5 166h0.0"
+ id="path506" />
+ <path
+ d="M511.0 166h0.0"
+ id="path508" />
+ <path
+ d="M331.5 166h30"
+ id="path510" />
+ <g
+ id="g514">
+ <path
+ d="M361.5 166h119.5"
+ id="path512" />
+ </g>
+ <path
+ d="M481.0 166h30"
+ id="path516" />
+ <path
+ d="M331.5 166a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"
+ id="path518" />
+ <g
+ id="g548">
+ <path
+ d="M361.5 197h0.0"
+ id="path520" />
+ <path
+ d="M481.0 197h0.0"
+ id="path522" />
+ <g
+ class="non-terminal"
+ id="g532">
+ <path
+ d="M361.5 197h0.0"
+ id="path524" />
+ <path
+ d="M424.0 197h0.0"
+ id="path526" />
+ <rect
+ height="22"
+ width="62.5"
+ x="361.5"
+ y="186"
+ id="rect528" />
+ <text
+ x="392.75"
+ y="201"
+ id="text530">param</text>
+ </g>
+ <path
+ d="M424.0 197h10"
+ id="path534" />
+ <path
+ d="M434.0 197h10"
+ id="path536" />
+ <g
+ class="terminal"
+ id="g546">
+ <path
+ d="M444.0 197h0.0"
+ id="path538" />
+ <path
+ d="M481.0 197h0.0"
+ id="path540" />
+ <rect
+ height="22"
+ rx="10"
+ ry="10"
+ width="37.0"
+ x="444.0"
+ y="186"
+ id="rect542" />
+ <text
+ x="462.5"
+ y="201"
+ id="text544">:=</text>
+ </g>
+ </g>
+ <path
+ d="M481.0 197a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"
+ id="path550" />
+ </g>
+ <path
+ d="M511.0 166h10"
+ id="path554" />
+ <g
+ class="non-terminal"
+ id="g564">
+ <path
+ d="M521.0 166h0.0"
+ id="path556" />
+ <path
+ d="M583.5 166h0.0"
+ id="path558" />
+ <rect
+ height="22"
+ width="62.5"
+ x="521.0"
+ y="155"
+ id="rect560" />
+ <text
+ x="552.25"
+ y="170"
+ id="text562">value</text>
+ </g>
+ </g>
+ <path
+ d="M583.5 166h15"
+ id="path568" />
+ <path
+ d="M331.5 166a15 15 0 0 0 -15 15v43a15 15 0 0 0 15 15"
+ id="path570" />
+ <g
+ class="terminal"
+ id="g580">
+ <path
+ d="M331.5 239h111.75"
+ id="path572" />
+ <path
+ d="M471.75 239h111.75"
+ id="path574" />
+ <rect
+ height="22"
+ rx="10"
+ ry="10"
+ width="28.5"
+ x="443.25"
+ y="228"
+ id="rect576" />
+ <text
+ x="457.5"
+ y="243"
+ id="text578">,</text>
+ </g>
+ <path
+ d="M583.5 239a15 15 0 0 0 15 -15v-43a15 15 0 0 0 -15 -15"
+ id="path582" />
+ </g>
+ <path
+ d="M647.0 166a15 15 0 0 0 15 -15v-85a15 15 0 0 1 15 -15"
+ id="path586" />
+ </g>
+ </g>
+ <path
+ d="M677.0 51h10"
+ id="path592" />
+ <path
+ d="M 687.0 51 h 20 m -10 -10 v 20 m 10 -20 v 20"
+ id="path594" />
+ </g>
+</svg>
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/LetSet_statement.svg b/source/media/helpimg/sbasic/LetSet_statement.svg
new file mode 100644
index 000000000..6e18d06bc
--- /dev/null
+++ b/source/media/helpimg/sbasic/LetSet_statement.svg
@@ -0,0 +1,46 @@
+<svg class="railroad-diagram" height="155" viewBox="0 0 668.5 155" width="668.5" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(.5 .5)">
+<style>/* <![CDATA[ */
+ svg.railroad-diagram {
+ background-color:transparent;
+ }
+ svg.railroad-diagram path {
+ stroke-width:1;
+ stroke:black;
+ fill:rgba(0,0,0,0);
+ }
+ svg.railroad-diagram text {
+ font:bold 14px monospace;
+ font-family: Verdana, sans-serif;
+ text-anchor:middle;
+ }
+ svg.railroad-diagram text.label{
+ text-anchor:start;
+ }
+ svg.railroad-diagram text.comment{
+ font:italic 12px monospace;
+ }
+ svg.railroad-diagram rect{
+ stroke-width:1;
+ stroke:black;
+ fill:transparent;
+ }
+
+/* ]]> */
+</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="M618.5 51h0.0"></path><g>
+<path d="M50.0 51h0.0"></path><path d="M215.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 20h105.5"></path></g><path d="M185.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="M185.5 51h0.0"></path><path d="M80.0 51h30"></path><g class="terminal">
+<path d="M110.0 51h0.0"></path><path d="M155.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="110.0" y="40"></rect><text x="132.75" y="55">Let</text></g><path d="M155.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="M155.5 93h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="110.0" y="82"></rect><text x="132.75" y="97">Set</text></g><path d="M155.5 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path></g><path d="M185.5 51h30"></path></g><path d="M215.5 51h10"></path><g class="terminal">
+<path d="M225.5 51h0.0"></path><path d="M313.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="88.0" x="225.5" y="40"></rect><text x="269.5" y="55">variable</text></g><path d="M313.5 51h10"></path><path d="M323.5 51h10"></path><g class="terminal">
+<path d="M333.5 51h0.0"></path><path d="M362.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="333.5" y="40"></rect><text x="347.75" y="55">=</text></g><path d="M362.0 51h10"></path><g>
+<path d="M372.0 51h0.0"></path><path d="M618.5 51h0.0"></path><path d="M372.0 51h30"></path><g class="terminal">
+<path d="M402.0 51h40.75"></path><path d="M547.75 51h40.75"></path><rect height="22" rx="10" ry="10" width="105.0" x="442.75" y="40"></rect><text x="495.25" y="55">expression</text></g><path d="M588.5 51h30"></path><path d="M372.0 51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g>
+<path d="M402.0 93h0.0"></path><path d="M588.5 93h0.0"></path><g>
+<path d="M402.0 93h0.0"></path><path d="M507.5 93h0.0"></path><path d="M402.0 93h30"></path><g>
+<path d="M432.0 93h45.5"></path></g><path d="M477.5 93h30"></path><path d="M402.0 93a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M432.0 124h0.0"></path><path d="M477.5 124h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="432.0" y="113"></rect><text x="454.75" y="128">New</text></g><path d="M477.5 124a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g><path d="M507.5 93h10"></path><g class="terminal">
+<path d="M517.5 93h0.0"></path><path d="M588.5 93h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="517.5" y="82"></rect><text x="553.0" y="97">object</text></g></g><path d="M588.5 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path></g></g><path d="M618.5 51h10"></path><path d="M 628.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/Resume_statement.svg b/source/media/helpimg/sbasic/Resume_statement.svg
new file mode 100644
index 000000000..214f6ba12
--- /dev/null
+++ b/source/media/helpimg/sbasic/Resume_statement.svg
@@ -0,0 +1,39 @@
+<svg class="railroad-diagram" height="166" viewBox="0 0 363.5 166" width="363.5" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(.5 .5)">
+<style>/* <![CDATA[ */
+ svg.railroad-diagram {
+ background-color:transparent;
+ }
+ svg.railroad-diagram path {
+ stroke-width:1;
+ stroke:black;
+ fill:rgba(0,0,0,0);
+ }
+ svg.railroad-diagram text {
+ font:bold 14px monospace;
+ font-family: Verdana, sans-serif;
+ text-anchor:middle;
+ }
+ svg.railroad-diagram text.label{
+ text-anchor:start;
+ }
+ svg.railroad-diagram text.comment{
+ font:italic 12px monospace;
+ }
+ svg.railroad-diagram rect{
+ stroke-width:1;
+ stroke:black;
+ fill:transparent;
+ }
+
+/* ]]> */
+</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="M313.5 51h0.0"></path><g class="terminal">
+<path d="M50.0 51h0.0"></path><path d="M121.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="50.0" y="40"></rect><text x="85.5" y="55">Resume</text></g><path d="M121.0 51h10"></path><g>
+<path d="M131.0 51h0.0"></path><path d="M313.5 51h0.0"></path><path d="M131.0 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
+<path d="M161.0 20h122.5"></path></g><path d="M283.5 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M131.0 51h30"></path><g>
+<path d="M161.0 51h0.0"></path><path d="M283.5 51h0.0"></path><path d="M161.0 51h30"></path><g class="terminal">
+<path d="M191.0 51h17.0"></path><path d="M236.5 51h17.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="208.0" y="40"></rect><text x="222.25" y="55">0</text></g><path d="M253.5 51h30"></path><path d="M161.0 51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M191.0 93h4.25"></path><path d="M249.25 93h4.25"></path><rect height="22" rx="10" ry="10" width="54.0" x="195.25" y="82"></rect><text x="222.25" y="97">Next</text></g><path d="M253.5 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><path d="M161.0 51a15 15 0 0 1 15 15v54a15 15 0 0 0 15 15"></path><g class="non-terminal">
+<path d="M191.0 135h0.0"></path><path d="M253.5 135h0.0"></path><rect height="22" width="62.5" x="191.0" y="124"></rect><text x="222.25" y="139">label</text></g><path d="M253.5 135a15 15 0 0 0 15 -15v-54a15 15 0 0 1 15 -15"></path></g><path d="M283.5 51h30"></path></g></g><path d="M313.5 51h10"></path><path d="M 323.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/text/sbasic/shared/03103100.xhp b/source/text/sbasic/shared/03103100.xhp
index 27af9b692..a03f8e04d 100644
--- a/source/text/sbasic/shared/03103100.xhp
+++ b/source/text/sbasic/shared/03103100.xhp
@@ -39,21 +39,24 @@
</section>
<paragraph id="hd_id3153127" role="heading" level="2" xml-lang="en-US">Syntax:</paragraph>
+<paragraph role="paragraph" id="par_id41586012988213">
+ <image src="media/helpimg/sbasic/LetSet_statement.svg" id="img_id4156306484514"><alt xml-lang="en-US" id="alt_id15152796484514">Let Statement diagram</alt></image>
+</paragraph>
<bascode>
-<paragraph id="par_id3154285" role="bascode" xml-lang="en-US">[Let] VarName=Expression</paragraph>
+<paragraph id="par_id3154285" role="bascode" localize="false">[Let] variable = expression</paragraph>
</bascode>
<paragraph id="hd_id3148944" role="heading" level="2" xml-lang="en-US">Parameters:</paragraph>
-<paragraph id="par_id3147560" role="paragraph" xml-lang="en-US"> <emph>VarName:</emph> Variable that you want to assign a value to. Value and variable type must be compatible.</paragraph>
+<paragraph id="par_id3147560" role="paragraph" xml-lang="en-US"> <emph>variable:</emph> Variable that you want to assign a value to. Value and variable type must be compatible.</paragraph>
<paragraph id="par_id3148451" role="note" xml-lang="en-US">As in most BASIC dialects, the keyword <emph>Let</emph> is optional.</paragraph>
<paragraph id="hd_id3145785" role="heading" level="2" xml-lang="en-US">Example:</paragraph>
<bascode>
-<paragraph id="par_idm1340853056" role="bascode" localize="false" xml-lang="en-US">Sub ExampleLet</paragraph>
-<paragraph id="par_idm1340851824" role="bascode" localize="false" xml-lang="en-US">Dim sText As String</paragraph>
-<paragraph id="par_idm1340850592" role="bascode" localize="false" xml-lang="en-US"> Let sText = "Las Vegas"</paragraph>
+<paragraph id="par_idm1340853056" role="bascode" localize="false">Sub ExampleLet</paragraph>
+<paragraph id="par_idm1340851824" role="bascode" localize="false">Dim sText As String</paragraph>
+<paragraph id="par_idm1340850592" role="bascode" localize="false"> Let sText = "Las Vegas"</paragraph>
<paragraph id="par_id3152939" role="bascode" xml-lang="en-US"> MsgBox Len(sText) ' returns 9</paragraph>
-<paragraph id="par_idm1340847616" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
+<paragraph id="par_idm1340847616" role="bascode" localize="false">End Sub</paragraph>
</bascode>
</body>
diff --git a/source/text/sbasic/shared/03103700.xhp b/source/text/sbasic/shared/03103700.xhp
index a5d0e9a02..fb7f33c3a 100644
--- a/source/text/sbasic/shared/03103700.xhp
+++ b/source/text/sbasic/shared/03103700.xhp
@@ -31,32 +31,37 @@
<section id="set">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154422">
<bookmark_value>Set statement</bookmark_value>
+ <bookmark_value>New keyword</bookmark_value>
<bookmark_value>Nothing object</bookmark_value>
</bookmark>
<paragraph id="hd_id3154422" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03103700.xhp" name="Set Statement">Set Statement</link></paragraph>
-<paragraph id="par_id3159149" role="paragraph" xml-lang="en-US">Sets an object reference on a variable or a Property.</paragraph>
+<paragraph id="par_id3159149" role="paragraph" xml-lang="en-US">Sets an object reference on a variable.</paragraph>
</section>
<paragraph id="hd_id3153105" role="heading" level="2" xml-lang="en-US">Syntax:</paragraph>
+<paragraph role="paragraph" id="par_id491585753339474">
+ <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 ObjectVar = Object</paragraph>
+<paragraph id="par_id3154217" role="bascode" xml-lang="en-US">Set variable = 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>ObjectVar:</emph> a variable or a property that requires an object reference.</paragraph>
-<paragraph id="par_id3159252" role="paragraph" xml-lang="en-US"> <emph>Object:</emph> Object that the variable or the property refers to.</paragraph>
-<paragraph id="par_idN10623" role="paragraph" xml-lang="en-US"> <emph>Nothing</emph> - Assign the <emph>Nothing</emph> object to a variable to remove a previous assignment.</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 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="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 oDoc As Object</paragraph>
-<paragraph id="par_idm1340833872" role="bascode" localize="false" xml-lang="en-US"> Set oDoc = ActiveWindow</paragraph>
-<paragraph id="par_idm1340832624" role="bascode" localize="false" xml-lang="en-US"> Print oDoc.Name</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>
</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>
</body>
</helpdocument>
More information about the Libreoffice-commits
mailing list