diff options
| -rw-r--r-- | Package_html_media.mk | 4 | ||||
| -rw-r--r-- | source/media/helpimg/sbasic/argument_fragment.svg | 40 | ||||
| -rw-r--r-- | source/media/helpimg/sbasic/char_fragment.svg (renamed from source/media/helpimg/sbasic/type-car_fragment.svg) | 7 | ||||
| -rw-r--r-- | source/media/helpimg/sbasic/typename_fragment.svg (renamed from source/media/helpimg/sbasic/type-name_fragment.svg) | 2 | ||||
| -rw-r--r-- | source/text/sbasic/shared/fragments.xhp | 20 |
5 files changed, 37 insertions, 36 deletions
diff --git a/Package_html_media.mk b/Package_html_media.mk index b1a95ec289..7ea9be6f50 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -109,8 +109,8 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE helpimg/smzb9.png \ helpimg/sbasic/argument_fragment.svg \ helpimg/sbasic/array_fragment.svg \ - helpimg/sbasic/type-car_fragment.svg \ - helpimg/sbasic/type-name_fragment.svg \ + helpimg/sbasic/char_fragment.svg \ + helpimg/sbasic/typename_fragment.svg \ helpimg/sbasic/Call_statement.svg \ helpimg/sbasic/Dim_statement.svg \ helpimg/sbasic/DimArray_function.svg \ diff --git a/source/media/helpimg/sbasic/argument_fragment.svg b/source/media/helpimg/sbasic/argument_fragment.svg index e6d09bab3a..a51bfa355f 100644 --- a/source/media/helpimg/sbasic/argument_fragment.svg +++ b/source/media/helpimg/sbasic/argument_fragment.svg @@ -1,4 +1,4 @@ -<svg class="railroad-diagram" height="217" viewBox="0 0 1085.5 217" width="1085.5" xmlns="http://www.w3.org/2000/svg"> +<svg class="railroad-diagram" height="217" viewBox="0 0 1077.0 217" width="1077.0" xmlns="http://www.w3.org/2000/svg"> <g transform="translate(.5 .5)"> <style>/* <![CDATA[ */ svg.railroad-diagram { @@ -29,7 +29,7 @@ /* ]]> */ </style><g> <path d="M20 41v20m0 -10h20"></path></g><path d="M40 51h10"></path><g> -<path d="M50 51h0.0"></path><path d="M1035.5 51h0.0"></path><g> +<path d="M50 51h0.0"></path><path d="M1027.0 51h0.0"></path><g> <path d="M50.0 51h0.0"></path><path d="M440.5 51h0.0"></path><path d="M50.0 51h30"></path><g> <path d="M80.0 51h0.0"></path><path d="M410.5 51h0.0"></path><g> <path d="M80.0 51h0.0"></path><path d="M228.0 51h0.0"></path><path d="M80.0 51h30"></path><g> @@ -42,22 +42,22 @@ <path d="M288.0 93h0.0"></path><path d="M350.5 93h0.0"></path><rect height="22" rx="10" ry="10" width="62.5" x="288.0" y="82"></rect><text x="319.25" y="97">ByVal</text></g><path d="M350.5 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path></g><path d="M380.5 51h30"></path></g></g><path d="M410.5 51h30"></path><path d="M50.0 51a15 15 0 0 1 15 15v54a15 15 0 0 0 15 15"></path><g class="terminal"> <path d="M80.0 135h112.75"></path><path d="M297.75 135h112.75"></path><rect height="22" rx="10" ry="10" width="105.0" x="192.75" y="124"></rect><text x="245.25" y="139">ParamArray</text></g><path d="M410.5 135a15 15 0 0 0 15 -15v-54a15 15 0 0 1 15 -15"></path></g><path d="M440.5 51h10"></path><g class="non-terminal"> <path d="M450.5 51h0.0"></path><path d="M538.5 51h0.0"></path><rect height="22" width="88.0" x="450.5" y="40"></rect><text x="494.5" y="55">argument</text></g><path d="M538.5 51h10"></path><g> -<path d="M548.5 51h0.0"></path><path d="M1035.5 51h0.0"></path><path d="M548.5 51h30"></path><g> -<path d="M578.5 51h0.0"></path><path d="M1005.5 51h0.0"></path><g> -<path d="M578.5 51h0.0"></path><path d="M792.0 51h0.0"></path><path d="M578.5 51h30"></path><g> -<path d="M608.5 51h0.0"></path><path d="M762.0 51h0.0"></path><g class="terminal"> +<path d="M548.5 51h0.0"></path><path d="M1027.0 51h0.0"></path><path d="M548.5 51h30"></path><g> +<path d="M578.5 51h0.0"></path><path d="M997.0 51h0.0"></path><g> +<path d="M578.5 51h0.0"></path><path d="M783.5 51h0.0"></path><path d="M578.5 51h30"></path><g> +<path d="M608.5 51h0.0"></path><path d="M753.5 51h0.0"></path><g class="terminal"> <path d="M608.5 51h0.0"></path><path d="M645.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="608.5" y="40"></rect><text x="627.0" y="55">As</text></g><path d="M645.5 51h10"></path><path d="M655.5 51h10"></path><g class="non-terminal"> -<path d="M665.5 51h0.0"></path><path d="M762.0 51h0.0"></path><rect height="22" width="96.5" x="665.5" y="40"></rect><text x="713.75" y="55">type-name</text></g></g><path d="M762.0 51h30"></path><path d="M578.5 51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="non-terminal"> -<path d="M608.5 93h32.75"></path><path d="M729.25 93h32.75"></path><rect height="22" width="88.0" x="641.25" y="82"></rect><text x="685.25" y="97">type-car</text></g><path d="M762.0 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path></g><g> -<path d="M792.0 51h0.0"></path><path d="M1005.5 51h0.0"></path><path d="M792.0 51h30"></path><g> -<path d="M822.0 51h153.5"></path></g><path d="M975.5 51h30"></path><path d="M792.0 51a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g> -<path d="M822.0 82h0.0"></path><path d="M975.5 82h0.0"></path><g class="terminal"> -<path d="M822.0 82h0.0"></path><path d="M850.5 82h0.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="822.0" y="71"></rect><text x="836.25" y="86">=</text></g><path d="M850.5 82h10"></path><path d="M860.5 82h10"></path><g class="non-terminal"> -<path d="M870.5 82h0.0"></path><path d="M975.5 82h0.0"></path><rect height="22" width="105.0" x="870.5" y="71"></rect><text x="923.0" y="86">expression</text></g></g><path d="M975.5 82a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g></g><path d="M1005.5 51h30"></path><path d="M548.5 51a15 15 0 0 1 15 15v74a15 15 0 0 0 15 15"></path><g> -<path d="M578.5 155h82.5"></path><path d="M923.0 155h82.5"></path><g> -<path d="M661.0 155h0.0"></path><path d="M758.0 155h0.0"></path><path d="M661.0 155h30"></path><g> -<path d="M691.0 155h37.0"></path></g><path d="M728.0 155h30"></path><path d="M661.0 155a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal"> -<path d="M691.0 186h0.0"></path><path d="M728.0 186h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="691.0" y="175"></rect><text x="709.5" y="190">()</text></g><path d="M728.0 186a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g><g> -<path d="M758.0 155h0.0"></path><path d="M923.0 155h0.0"></path><path d="M758.0 155a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g> -<path d="M788.0 124h105.0"></path></g><path d="M893.0 124a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M758.0 155h30"></path><g class="terminal"> -<path d="M788.0 155h0.0"></path><path d="M893.0 155h0.0"></path><rect height="22" rx="10" ry="10" width="105.0" x="788.0" y="144"></rect><text x="840.5" y="159">As Variant</text></g><path d="M893.0 155h30"></path></g></g><path d="M1005.5 155a15 15 0 0 0 15 -15v-74a15 15 0 0 1 15 -15"></path></g></g><path d="M1035.5 51h10"></path><path d="M 1045.5 51 h 20 m 0 -10 v 20"></path></g></svg>
\ No newline at end of file +<path d="M665.5 51h0.0"></path><path d="M753.5 51h0.0"></path><rect height="22" width="88.0" x="665.5" y="40"></rect><text x="709.5" y="55">typename</text></g></g><path d="M753.5 51h30"></path><path d="M578.5 51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="non-terminal"> +<path d="M608.5 93h45.5"></path><path d="M708.0 93h45.5"></path><rect height="22" width="54.0" x="654.0" y="82"></rect><text x="681.0" y="97">char</text></g><path d="M753.5 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path></g><g> +<path d="M783.5 51h0.0"></path><path d="M997.0 51h0.0"></path><path d="M783.5 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g> +<path d="M813.5 20h153.5"></path></g><path d="M967.0 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M783.5 51h30"></path><g> +<path d="M813.5 51h0.0"></path><path d="M967.0 51h0.0"></path><g class="terminal"> +<path d="M813.5 51h0.0"></path><path d="M842.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="813.5" y="40"></rect><text x="827.75" y="55">=</text></g><path d="M842.0 51h10"></path><path d="M852.0 51h10"></path><g class="non-terminal"> +<path d="M862.0 51h0.0"></path><path d="M967.0 51h0.0"></path><rect height="22" width="105.0" x="862.0" y="40"></rect><text x="914.5" y="55">expression</text></g></g><path d="M967.0 51h30"></path></g></g><path d="M997.0 51h30"></path><path d="M548.5 51a15 15 0 0 1 15 15v74a15 15 0 0 0 15 15"></path><g> +<path d="M578.5 155h78.25"></path><path d="M918.75 155h78.25"></path><g> +<path d="M656.75 155h0.0"></path><path d="M753.75 155h0.0"></path><path d="M656.75 155h30"></path><g> +<path d="M686.75 155h37.0"></path></g><path d="M723.75 155h30"></path><path d="M656.75 155a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal"> +<path d="M686.75 186h0.0"></path><path d="M723.75 186h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="686.75" y="175"></rect><text x="705.25" y="190">()</text></g><path d="M723.75 186a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g><g> +<path d="M753.75 155h0.0"></path><path d="M918.75 155h0.0"></path><path d="M753.75 155a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g> +<path d="M783.75 124h105.0"></path></g><path d="M888.75 124a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M753.75 155h30"></path><g class="terminal"> +<path d="M783.75 155h0.0"></path><path d="M888.75 155h0.0"></path><rect height="22" rx="10" ry="10" width="105.0" x="783.75" y="144"></rect><text x="836.25" y="159">As Variant</text></g><path d="M888.75 155h30"></path></g></g><path d="M997.0 155a15 15 0 0 0 15 -15v-74a15 15 0 0 1 15 -15"></path></g></g><path d="M1027.0 51h10"></path><path d="M 1037.0 51 h 20 m 0 -10 v 20"></path></g></svg>
\ No newline at end of file diff --git a/source/media/helpimg/sbasic/type-car_fragment.svg b/source/media/helpimg/sbasic/char_fragment.svg index 8bc73c93ed..1edbf913a1 100644 --- a/source/media/helpimg/sbasic/type-car_fragment.svg +++ b/source/media/helpimg/sbasic/char_fragment.svg @@ -1,4 +1,4 @@ -<svg class="railroad-diagram" height="102" viewBox="0 0 472.5 102" width="472.5" xmlns="http://www.w3.org/2000/svg"> +<svg class="railroad-diagram" height="102" viewBox="0 0 551.0 102" width="551.0" xmlns="http://www.w3.org/2000/svg"> <g transform="translate(.5 .5)"> <style>/* <![CDATA[ */ svg.railroad-diagram { @@ -29,9 +29,10 @@ /* ]]> */ </style><g> <path d="M20 41v20m0 -10h20"></path></g><g> -<path d="M40 51h0.0"></path><path d="M432.5 51h0.0"></path><path d="M40.0 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15h269.0"></path><path d="M133.5 82h269.0a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><path d="M40.0 51h15"></path><g class="terminal"> +<path d="M40 51h0.0"></path><path d="M511.0 51h0.0"></path><path d="M40.0 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15h347.5"></path><path d="M133.5 82h347.5a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><path d="M40.0 51h15"></path><g class="terminal"> <path d="M55.0 51h10.0"></path><path d="M93.5 51h10.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="65.0" y="40"></rect><text x="79.25" y="55">%</text></g><path d="M103.5 51a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M103.5 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal"> <path d="M133.5 51h10.0"></path><path d="M172.0 51h10.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="143.5" y="40"></rect><text x="157.75" y="55">&</text></g><path d="M182.0 51a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M182.0 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal"> <path d="M212.0 51h10.0"></path><path d="M250.5 51h10.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="222.0" y="40"></rect><text x="236.25" y="55">!</text></g><path d="M260.5 51a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M260.5 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal"> <path d="M290.5 51h10.0"></path><path d="M329.0 51h10.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="300.5" y="40"></rect><text x="314.75" y="55">#</text></g><path d="M339.0 51a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M339.0 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal"> -<path d="M369.0 51h10.0"></path><path d="M407.5 51h10.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="379.0" y="40"></rect><text x="393.25" y="55">$</text></g><path d="M417.5 51h15"></path></g><path d="M 432.5 51 h 20 m 0 -10 v 20"></path></g></svg>
\ No newline at end of file +<path d="M369.0 51h10.0"></path><path d="M407.5 51h10.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="379.0" y="40"></rect><text x="393.25" y="55">$</text></g><path d="M417.5 51a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M417.5 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="terminal"> +<path d="M447.5 51h10.0"></path><path d="M486.0 51h10.0"></path><rect height="22" rx="10" ry="10" width="28.5" x="457.5" y="40"></rect><text x="471.75" y="55">@</text></g><path d="M496.0 51h15"></path></g><path d="M 511.0 51 h 20 m 0 -10 v 20"></path></g></svg>
\ No newline at end of file diff --git a/source/media/helpimg/sbasic/type-name_fragment.svg b/source/media/helpimg/sbasic/typename_fragment.svg index 3e6926e539..ddc0fdf2bc 100644 --- a/source/media/helpimg/sbasic/type-name_fragment.svg +++ b/source/media/helpimg/sbasic/typename_fragment.svg @@ -26,7 +26,7 @@ fill:transparent; } -/* ]]> */ +/* ]]> */ </style><g> <path d="M20 125v20m0 -10h20"></path></g><g> <path d="M40 135h0.0"></path><path d="M387.5 135h0.0"></path><path d="M40.0 135a15 15 0 0 0 15 -15v-85a15 15 0 0 1 15 -15h133.0"></path><path d="M233.0 250h124.5a15 15 0 0 0 15 -15v-85a15 15 0 0 1 15 -15"></path><path d="M40.0 135h15"></path><g> diff --git a/source/text/sbasic/shared/fragments.xhp b/source/text/sbasic/shared/fragments.xhp index a0ab0b5753..ad22ea5194 100644 --- a/source/text/sbasic/shared/fragments.xhp +++ b/source/text/sbasic/shared/fragments.xhp @@ -24,14 +24,14 @@ <h4 id="hd_id431587045941514"><variable id="argumenth2"><link href="text/sbasic/shared/fragments.xhp" name="arguments in Function, Sub and Property statements"></link></variable>argument fragment</h4> <paragraph role="paragraph" id="par_id491585753339474"><image src="media/helpimg/sbasic/argument_fragment.svg" id="img_id4156296484514"><alt xml-lang="en-US" id="alt_id15152796484514">argument fragment</alt></image></paragraph> <bascode> - <paragraph role="bascode" id="par_id3151084" localize="false">{[Optional [ByRef|ByVal]]|ParamArray} argument {{As type-name|type-car}[ = expression]|[()]As Variant}</paragraph> + <paragraph role="bascode" id="par_id3151084" localize="false">{[Optional [ByRef|ByVal]]|ParamArray} argument {{As typename|char}[ = expression]|[()]As Variant}</paragraph> </bascode> <h4 id="hd_id811587303969210">Parameters</h4> <paragraph role="paragraph" id="par_id481586090298901"><literal>Optional</literal>: The argument is not mandatory.</paragraph> <paragraph role="paragraph" id="par_id331586090532804"><literal>ByRef</literal>: The argument is passed by reference. <literal>ByRef</literal> is the default.</paragraph> <paragraph role="paragraph" id="par_id331586090432804"><literal>ByVal</literal>: The argument is passed by value. Its value can be modified by the called routine.</paragraph> - <paragraph role="paragraph" id="par_id651587044335713"><emph>type-car:</emph> Type declaration character.</paragraph> - <paragraph role="paragraph" id="par_id651587044336713"><emph>type-name</emph>: Primitive data type name. Library or module defined types can also be specified.</paragraph> + <paragraph role="paragraph" id="par_id651587044335713"><emph>char:</emph> Type declaration character.</paragraph> + <paragraph role="paragraph" id="par_id651587044336713"><emph>typename</emph>: Primitive data type name. Library or module defined types can also be specified.</paragraph> <paragraph role="paragraph" id="par_id11587045141290"><emph>= expression</emph>: Specify a default value for the argument, matching its declared type. <literal>Optional</literal> is necessary for each argument specifying a default value.</paragraph> <paragraph role="paragraph" id="par_id331586091432804"><literal>ParamArray</literal>: Use <literal>ParamArray</literal> when the number of parameters is undetermined. A typical scenario is that of a Calc user-defined function. Using <literal>ParamArray</literal> should be limited to the last argument of a routine.</paragraph> <tip id="par_id851587050837107">Using<literal>ParamArray</literal> or <emph>= expression</emph> require <link href="text/sbasic/shared/compatible.xhp" name ="Option Compatible">Option Compatible</link> to be placed before the executable program code in a module.</tip> @@ -39,7 +39,7 @@ </section> <section id="array"> - <h4 id="hd_id231587046013456"><variable id="arrayh2"><link href="text/sbasic/shared/fragments.xhp" name="array syntax fragment"></link></variable>array fragment</h4> + <h4 id="hd_id231587046013456"><variable id="arrayh4"><link href="text/sbasic/shared/fragments.xhp" name="array syntax fragment"></link></variable>array fragment</h4> <paragraph role="paragraph" id="par_id491586753339473"><image src="media/helpimg/sbasic/array_fragment.svg" id="img_id4156296484514"><alt xml-lang="en-US" id="alt_id15152796484514">array fragment</alt></image></paragraph> <bascode> <paragraph role="bascode" id="par_id3150983" localize="false">( [[start To] end], .. )</paragraph> @@ -51,18 +51,18 @@ </section> <section id="typename"> - <h4 id="hd_id231587046013458"><variable id="typenameh2"><link href="text/sbasic/shared/fragments.xhp" name="data types fragment"></link></variable>type-name fragment</h4> - <paragraph role="paragraph" id="par_id501586753339474"><image src="media/helpimg/sbasic/type-name_fragment.svg" id="img_id4157296484514"><alt xml-lang="en-US" id="alt_id15152796484515">data types fragment</alt></image></paragraph> + <h4 id="hd_id231587046013458"><variable id="typenameh4"><link href="text/sbasic/shared/fragments.xhp" name="data types fragment"></link></variable>typename fragment</h4> + <paragraph role="paragraph" id="par_id501586753339474"><image src="media/helpimg/sbasic/typename_fragment.svg" id="img_id4157296484514"><alt xml-lang="en-US" id="alt_id15152796484515">primitive data types fragment</alt></image></paragraph> <bascode> <paragraph role="bascode" id="par_id3150985" localize="false">{Boolean|Byte|Currency|Date|Double|Integer|Long|Object|Single|String|Variant}</paragraph> </bascode> </section> -<section id="typecar"> - <h4 id="hd_id231587046013459"><variable id="typecarh2"><link href="text/sbasic/shared/fragments.xhp" name="type declaration characters fragment"></link></variable>type-car fragment</h4> - <paragraph role="paragraph" id="par_id511586753339474"><image src="media/helpimg/sbasic/type-car_fragment.svg" id="img_id4157296484514"><alt xml-lang="en-US" id="alt_id15152796484516">type declaration characters</alt></image></paragraph> +<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> + <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> + <paragraph role="bascode" id="par_id3150986" localize="false">{ % | & | ! | # | $ | @ }</paragraph> </bascode> </section> |
