diff options
| author | LibreOfficiant <LibreOfficiant@sfr.fr> | 2020-04-29 12:13:50 +0200 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2020-04-30 18:07:54 +0200 |
| commit | 21fd17892ae4827f66d16a67a9c30c1854c5079d (patch) | |
| tree | bfacb37e68872e729d34de61c4e88c34843a0a9d /source/text/sbasic | |
| parent | 5999ae5b939b73fbb194547a7bd134859a3c8a43 (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>
Diffstat (limited to 'source/text/sbasic')
| -rw-r--r-- | source/text/sbasic/shared/03090413.xhp | 2 | ||||
| -rw-r--r-- | source/text/sbasic/shared/03103700.xhp | 26 |
2 files changed, 17 insertions, 11 deletions
diff --git a/source/text/sbasic/shared/03090413.xhp b/source/text/sbasic/shared/03090413.xhp index c77ca05283..806d8fed47 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 fb7f33c3ab..dbbfa1cb3f 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 |