[Libreoffice-commits] help.git: Package_html_media.mk source/media source/text

LibreOfficiant (via logerrit) logerrit at kemper.freedesktop.org
Wed Apr 1 16:17:07 UTC 2020


 Package_html_media.mk                          |    1 
 source/media/helpimg/sbasic/Call_statement.svg |   58 +++++++++++++++++++++++++
 source/text/sbasic/shared/03090401.xhp         |   12 +++--
 3 files changed, 66 insertions(+), 5 deletions(-)

New commits:
commit cb85f4bc7fb510f55321857d26f895b81f4c5964
Author:     LibreOfficiant <LibreOfficiant at sfr.fr>
AuthorDate: Wed Apr 1 13:52:33 2020 +0100
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Wed Apr 1 18:16:48 2020 +0200

    Call statement syntax diagram
    
    Change-Id: Ia4cae7ee6078cf056b50009f73f8d545dc1b0384
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/91506
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/Package_html_media.mk b/Package_html_media.mk
index 5cea8c8eb..4e8aefc3d 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     helpimg/smzb7.png \
     helpimg/smzb8.png \
     helpimg/smzb9.png \
+    helpimg/sbasic/Call_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
new file mode 100644
index 000000000..3dd36a029
--- /dev/null
+++ b/source/media/helpimg/sbasic/Call_statement.svg
@@ -0,0 +1,58 @@
+<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[ */
+    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="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
diff --git a/source/text/sbasic/shared/03090401.xhp b/source/text/sbasic/shared/03090401.xhp
index f0083c539..b63978d0c 100644
--- a/source/text/sbasic/shared/03090401.xhp
+++ b/source/text/sbasic/shared/03090401.xhp
@@ -36,14 +36,16 @@
 <paragraph role="paragraph" id="par_id3153394" xml-lang="en-US">Transfers the control of the program to a subroutine, a function, or a DLL procedure.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="2">Syntax:</paragraph>
+<paragraph role="paragraph" id="par_id491585753339474">
+  <image src="media/helpimg/sbasic/Call_statement.svg" id="img_id4156296484514"><alt xml-lang="en-US" id="alt_id15152796484514">Call Statement diagram</alt></image></paragraph>
 <bascode>
-<paragraph role="bascode" id="par_id3150984" xml-lang="en-US">[Call] Name [Parameter]</paragraph>
+<paragraph role="bascode" id="par_id3150984" xml-lang="en-US">[Call] name [(] [param :=] value, ... [)] </paragraph>
 </bascode>
 <paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="2">Parameters:</paragraph>
 <paragraph role="paragraph" id="par_id3148473" xml-lang="en-US">
-<emph>Name:</emph> Name of the subroutine, the function, or the DLL that you want to call</paragraph>
+<emph>name:</emph> Name of the subroutine, the function, or the DLL that you want to call</paragraph>
 <paragraph role="paragraph" id="par_id3148946" xml-lang="en-US">
-<emph>Parameter:</emph> Parameters to pass to the procedure. The type and number of parameters is dependent on the routine that is executing.</paragraph>
+<emph>param:</emph> Parameters to pass to the procedure. The keyword, type and number of parameters is dependent on the routine that is being called.</paragraph>
 <paragraph role="note" id="par_id3154216" xml-lang="en-US">A keyword is optional when you call a procedure. If a function is executed as an expression, the parameters must be enclosed by brackets in the statement. If a DLL is called, it must first be specified in the <emph>Declare-Statement</emph>.</paragraph>
 <paragraph role="heading" id="hd_id3125865" xml-lang="en-US" level="2">Example:</paragraph>
 <bascode>
@@ -51,6 +53,7 @@
 <paragraph role="bascode" id="par_id3161832" xml-lang="en-US" localize="false">Dim sVar As String</paragraph>
 <paragraph role="bascode" id="par_id3147317" xml-lang="en-US" localize="false">    sVar = "LibreOffice"</paragraph>
 <paragraph role="bascode" id="par_id3145273" xml-lang="en-US" localize="false">    Call f_callFun sVar</paragraph>
+<paragraph role="bascode" id="bas_id181585749262948" xml-lang="en-US" localize="false">    f_callFun sText := sVar</paragraph>
 <paragraph role="bascode" id="par_id3147435" xml-lang="en-US" localize="false">End Sub</paragraph>
 <paragraph role="bascode" id="par_id3147436" xml-lang="en-US" localize="false"></paragraph>
 <paragraph role="bascode" id="par_id3155414" xml-lang="en-US" localize="false">Sub f_callFun (sText as String)</paragraph>
@@ -58,5 +61,4 @@
 <paragraph role="bascode" id="par_id3148646" xml-lang="en-US" localize="false">End Sub</paragraph>
 </bascode>
 </body>
-</helpdocument>
-
+</helpdocument>
\ No newline at end of file


More information about the Libreoffice-commits mailing list