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

Alain Romedenne (via logerrit) logerrit at kemper.freedesktop.org
Fri Oct 9 16:03:03 UTC 2020


 source/auxiliary/sbasic.tree                      |    1 +
 source/media/helpimg/sbasic/Defxxx_statements.svg |    5 +++--
 source/text/sbasic/shared/03101100.xhp            |    7 ++++---
 source/text/sbasic/shared/03101120.xhp            |    3 +--
 source/text/sbasic/shared/03102000.xhp            |    2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 090116c2791f65e2871b0211ba78f6a4a742dba7
Author:     Alain Romedenne <LibreOfficiant at sfr.fr>
AuthorDate: Mon Oct 5 15:33:49 2020 +0200
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Fri Oct 9 18:02:44 2020 +0200

    tdf#134xxx DefErr syntax diagram
    
    - toc update
    - prefix dupe usage fixed - letter 'k'
    - DefErr diagram
    
    Change-Id: Ib3bd1b5907eae42b088d0b0b39d3e5f70dc0c43d
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103971
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index 1db5006a2..6e3c33ff4 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -120,6 +120,7 @@
                     <topic id="sbasic/text/sbasic/shared/03101110.xhp">DefCur Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03101300.xhp">DefDate Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03101400.xhp">DefDbl Statement</topic>
+                    <topic id="sbasic/text/sbasic/shared/03101120.xhp">DefErr Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03101500.xhp">DefInt Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03101600.xhp">DefLng Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03101700.xhp">DefObj Statement</topic>
diff --git a/source/media/helpimg/sbasic/Defxxx_statements.svg b/source/media/helpimg/sbasic/Defxxx_statements.svg
index c438bf408..769d856d4 100644
--- a/source/media/helpimg/sbasic/Defxxx_statements.svg
+++ b/source/media/helpimg/sbasic/Defxxx_statements.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="270" viewBox="0 0 697.0 270" width="697.0" xmlns="http://www.w3.org/2000/svg">
+<svg class="railroad-diagram" height="292" viewBox="0 0 697.0 292" width="697.0" xmlns="http://www.w3.org/2000/svg">
 <g transform="translate(.5 .5)">
 <style>/* <![CDATA[ */
     svg.railroad-diagram {
@@ -35,7 +35,8 @@
 <path d="M85.0 51h0.0"></path><path d="M164.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="85.0" y="40"></rect><text x="124.75" y="55">DefBool</text></g><path d="M164.5 51a15 15 0 0 1 15 15v54a15 15 0 0 0 15 15"></path><path d="M55.0 135h30"></path><g class="terminal">
 <path d="M85.0 135h0.0"></path><path d="M164.5 135h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="85.0" y="124"></rect><text x="124.75" y="139">DefDate</text></g><path d="M164.5 135h30"></path><path d="M55.0 135a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
 <path d="M85.0 177h4.25"></path><path d="M160.25 177h4.25"></path><rect height="22" rx="10" ry="10" width="71.0" x="89.25" y="166"></rect><text x="124.75" y="181">DefDbl</text></g><path d="M164.5 177a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><path d="M55.0 135a15 15 0 0 1 15 15v54a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M85.0 219h4.25"></path><path d="M160.25 219h4.25"></path><rect height="22" rx="10" ry="10" width="71.0" x="89.25" y="208"></rect><text x="124.75" y="223">DefInt</text></g><path d="M164.5 219a15 15 0 0 0 15 -15v-54a15 15 0 0 1 15 -15"></path></g><path d="M194.5 135a15 15 0 0 1 15 15v85a15 15 0 0 0 15 15"></path><path d="M194.5 20a15 15 0 0 1 15 15v85a15 15 0 0 0 15 15"></path><g>
+<path d="M85.0 219h4.25"></path><path d="M160.25 219h4.25"></path><rect height="22" rx="10" ry="10" width="71.0" x="89.25" y="208"></rect><text x="124.75" y="223">DefErr</text></g><path d="M164.5 219a15 15 0 0 0 15 -15v-54a15 15 0 0 1 15 -15"></path><path d="M55.0 135a15 15 0 0 1 15 15v96a15 15 0 0 0 15 15"></path><g class="terminal">
+<path d="M85.0 261h4.25"></path><path d="M160.25 261h4.25"></path><rect height="22" rx="10" ry="10" width="71.0" x="89.25" y="250"></rect><text x="124.75" y="265">DefInt</text></g><path d="M164.5 261a15 15 0 0 0 15 -15v-96a15 15 0 0 1 15 -15"></path></g><path d="M194.5 135a15 15 0 0 1 15 15v85a15 15 0 0 0 15 15"></path><path d="M194.5 20a15 15 0 0 1 15 15v85a15 15 0 0 0 15 15"></path><g>
 <path d="M224.5 135h0.0"></path><path d="M355.5 135h0.0"></path><path d="M224.5 135a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path><g class="terminal">
 <path d="M254.5 93h0.0"></path><path d="M325.5 93h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="254.5" y="82"></rect><text x="290.0" y="97">DefObj</text></g><path d="M325.5 93a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><path d="M224.5 135a15 15 0 0 0 15 -15v-54a15 15 0 0 1 15 -15"></path><g class="terminal">
 <path d="M254.5 51h0.0"></path><path d="M325.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="254.5" y="40"></rect><text x="290.0" y="55">DefLng</text></g><path d="M325.5 51a15 15 0 0 1 15 15v54a15 15 0 0 0 15 15"></path><path d="M224.5 135h30"></path><g class="terminal">
diff --git a/source/text/sbasic/shared/03101100.xhp b/source/text/sbasic/shared/03101100.xhp
index fdc15a361..811494ccb 100644
--- a/source/text/sbasic/shared/03101100.xhp
+++ b/source/text/sbasic/shared/03101100.xhp
@@ -42,7 +42,7 @@
     <image src="media/helpimg/sbasic/Defxxx_statements.svg" id="img_id4156296484514"><alt xml-lang="en-US" id="alt_id15152796484514">DefType statements diagram</alt></image>
   </paragraph>
   <bascode>
-    <paragraph id="par_id3150682" role="bascode" localize="false">{DefBool|DefCur|DefDate|DefDbl|DefInt|DefLng|DefObj|DefStr|DefSng|DefVar} {char|char-char}[,...]</paragraph>
+    <paragraph id="par_id3150682" role="bascode" localize="false">{DefBool|DefCur|DefDate|DefDbl|DefErr|DefInt|DefLng|DefObj|DefStr|DefSng|DefVar} {char|char-char}[,...]</paragraph>
   </bascode>
 
   <embed href="text/sbasic/shared/00000003.xhp#functparameters"/>
@@ -56,15 +56,16 @@
   <bascode>
     <paragraph id="par_id3156152" role="bascode" xml-lang="en-US">' Prefix definitions for variable types:</paragraph>
     <paragraph id="par_idm1341573120" role="bascode" localize="false">DefBool b</paragraph>
-    <paragraph id="par_idm1341571778" role="bascode" localize="false">DefCur c,k-m</paragraph>
+    <paragraph id="par_idm1341571778" role="bascode" localize="false">DefCur c,l-m</paragraph>
     <paragraph id="par_idm1341571888" role="bascode" localize="false">DefDate t</paragraph>
     <paragraph id="par_idm1341570656" role="bascode" localize="false">DefDbl f</paragraph>
+    <paragraph id="par_idm1341570656" role="bascode" localize="false">DefErr e</paragraph>
     <paragraph id="par_idm1341569424" role="bascode" localize="false">DefInt i-k,N</paragraph>
     <paragraph id="par_idm1341568192" role="bascode" localize="false">DefLng x-z, D</paragraph>
     <paragraph id="par_idm1341566960" role="bascode" localize="false">DefObj U, o-R</paragraph>
     <paragraph id="par_idm1352566960" role="bascode" localize="false">DefSng w,a</paragraph>
     <paragraph id="par_idm1341676960" role="bascode" localize="false">DefStr s</paragraph>
-    <paragraph id="par_idm1341565728" role="bascode" localize="false">DefVar V,g,E</paragraph>
+    <paragraph id="par_idm1341565728" role="bascode" localize="false">DefVar V,g</paragraph>
 </bascode>
 </section>
 <bascode>
diff --git a/source/text/sbasic/shared/03101120.xhp b/source/text/sbasic/shared/03101120.xhp
index 7bdb551bb..35c1cbba7 100644
--- a/source/text/sbasic/shared/03101120.xhp
+++ b/source/text/sbasic/shared/03101120.xhp
@@ -32,12 +32,11 @@
   <bookmark_value>DefErr statement</bookmark_value>
 </bookmark>
 
-<paragraph id="par_idN1057D" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03101120.xhp">DefErr Statement</link></paragraph>
+<h1 id="par_idN1057D"><link href="text/sbasic/shared/03101120.xhp">DefErr Statement</link></h1>
 <paragraph id="par_idN1058D" role="paragraph" xml-lang="en-US">If no type-declaration character or keyword is specified, the DefErr statement sets the default variable type, according to a letter range.</paragraph>
 </section>
 
 <embed href="text/sbasic/shared/03101100.xhp#PrefixDefCommon"/>
-<paragraph id="par_idN105B0" role="paragraph" xml-lang="en-US"> <emph>DefErr:</emph> Error</paragraph>
 
 <embed href="text/sbasic/shared/03101100.xhp#ExamplePrefixDefCommon"/>
 <bascode>
diff --git a/source/text/sbasic/shared/03102000.xhp b/source/text/sbasic/shared/03102000.xhp
index 422b417cf..2e7a31252 100644
--- a/source/text/sbasic/shared/03102000.xhp
+++ b/source/text/sbasic/shared/03102000.xhp
@@ -43,7 +43,7 @@
   <paragraph id="par_idm1341090720" role="bascode" localize="false" xml-lang="en-US">Sub ExampleDefVar</paragraph>
   <paragraph id="par_id3154012" role="bascode" xml-lang="en-US">    vDiv=99 ' vDiv is an implicit variant</paragraph>
   <paragraph id="par_id3146121" role="bascode" xml-lang="en-US">    values="Hello world"</paragraph>
-  <paragraph id="par_id3147221" role="bascode" xml-lang="en-US">    Print Typename(glob), VarType(values), IsEmpty(ergo_sum) ' Displays: Empty 8 True</paragraph>
+  <paragraph id="par_id3147221" role="bascode" xml-lang="en-US">    Print Typename(glob), VarType(values), IsEmpty(vOffer) ' Displays: Empty 8 True</paragraph>
   <paragraph id="par_idm1341086032" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
 </bascode>
 </body>


More information about the Libreoffice-commits mailing list