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

Mon Dec 23 18:33:35 UTC 2019

source/text/sbasic/shared/01020100.xhp |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 32de39e587a6b4c1e51c03d0a9497e8c871ac60b
Author:     LibreOﬃciant <LibreOfficiant at sfr.fr>
AuthorDate: Fri Dec 20 11:58:33 2019 +0100
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Mon Dec 23 19:33:15 2019 +0100

    tdf#62326 &o &h literal notations
    
    &b notation isn't supported
    
    Change-Id: Ic1dd13326e13623d74c4bf70c6cdb01a33733b44
    Reviewed-on: https://gerrit.libreoffice.org/85590
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/source/text/sbasic/shared/01020100.xhp b/source/text/sbasic/shared/01020100.xhp
index 8c68531a6..8b777f7ba 100644
--- a/source/text/sbasic/shared/01020100.xhp
+++ b/source/text/sbasic/shared/01020100.xhp
@@ -27,7 +27,6 @@
 
 <body>
 
-
 <section id="variable">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149346">
   <bookmark_value>names of variables</bookmark_value>
@@ -35,6 +34,13 @@
   <bookmark_value>types of variables</bookmark_value>
   <bookmark_value>declaring variables</bookmark_value>
   <bookmark_value>values;of variables</bookmark_value>
+  <bookmark_value>literals;integer</bookmark_value>
+  <bookmark_value>literals;hexadecimal</bookmark_value>
+  <bookmark_value>literals;integer</bookmark_value>
+  <bookmark_value>literals;octal</bookmark_value>
+  <bookmark_value>literals;&h notation</bookmark_value>
+  <bookmark_value>literals;&o notation</bookmark_value>
+  <bookmark_value>literals;floating-point</bookmark_value>
   <bookmark_value>constants</bookmark_value>
   <bookmark_value>arrays;declaring</bookmark_value>
   <bookmark_value>defining;constants</bookmark_value>
@@ -117,16 +123,16 @@
 <paragraph id="par_id1593676" role="paragraph" xml-lang="en-US">If a decimal number is assigned to an integer variable, %PRODUCTNAME Basic rounds the figure up or down.<comment>information from "Programming Guide for BASIC" about decimal variables</comment></paragraph>
 
 <paragraph id="hd_id3147500" role="heading" level="3" xml-lang="en-US">Single Variables</paragraph>
-<paragraph id="par_id3153070" role="paragraph" xml-lang="en-US">Single variables can take positive or negative values ranging from 3.402823 x 10E38 to 1.401298 x 10E-45. Single variables are floating-point variables, in which the decimal precision decreases as the non-decimal part of the number increases. Single variables are suitable for mathematical calculations of average precision. Calculations require more time than for Integer variables, but are faster than calculations with Double variables. A Single variable requires 4 bytes of memory. The type-declaration character is "!".</paragraph>
+<paragraph id="par_id3153070" role="paragraph" xml-lang="en-US">Single variables can take positive or negative values ranging from 3.402823 x 10E38 to 1.401298 x 10E-45. Single variables are floating-point variables, in which the decimal precision decreases as the non-decimal part of the number increases. Single variables are suitable for mathematical calculations of average precision. Calculations require more time than for Integer variables, but are faster than calculations with Double variables. A Single variable requires 4 bytes of memory. The type-declaration character is "!".</paragraph>
 <bascode>
 <paragraph id="par_idm1341137456" role="bascode" localize="false" xml-lang="en-US">Dim Variable!</paragraph>
 <paragraph id="par_idm1341136224" role="bascode" localize="false" xml-lang="en-US">Dim Variable As Single</paragraph>
 </bascode>
 
 <paragraph id="hd_id3155753" role="heading" level="3" xml-lang="en-US">Double Variables</paragraph>
-<paragraph id="par_id3150953" role="paragraph" xml-lang="en-US">Double variables can take positive or negative values ranging from 1.79769313486232 x 10E308 to 4.94065645841247 x 10E-324. Double variables are floating-point variables, in which the decimal precision decreases as the non-decimal part of the number increases. Double variables are suitable for precise calculations. Calculations require more time than for Single variables. A Double variable requires 8 bytes of memory. The type-declaration character is "#".</paragraph>
+<paragraph id="par_id3150953" role="paragraph" xml-lang="en-US">Double variables can take positive or negative values ranging from 1.79769313486232 x 10E308 to 4.94065645841247 x 10E-324. Double variables are floating-point variables, in which the decimal precision decreases as the non-decimal part of the number increases. Double variables are suitable for precise calculations. Calculations require more time than for Single variables. A Double variable requires 8 bytes of memory. The type-declaration character is "#".</paragraph>
 <bascode>
-<paragraph id="par_idm1341130144" role="bascode" localize="false" xml-lang="en-US">Dim Variable#</paragraph>
+<paragraph id="par_idm1341130144" role="bascode"  xml-lang="en-US">Dim Variable#</paragraph>
 <paragraph id="par_idm1341128912" role="bascode" localize="false" xml-lang="en-US">Dim Variable As Double</paragraph>
 </bascode>
 
@@ -137,6 +143,17 @@
 <paragraph id="par_idm1341121984" role="bascode" localize="false" xml-lang="en-US">Dim Variable As Currency</paragraph>
 </bascode>
 
+<h3 id="hd_id301576839713868">Literals for integers</h3>
+<paragraph role="paragraph" id="par_id1001576839723156">Numbers can be encoded using octal and hexadecimal forms.</paragraph>
+<bascode>
+  <paragraph role="bascode" id="bas_id331576850637825" localize="false">xi = &o13 '    8 + 3</paragraph>
+  <paragraph role="bascode" id="bas_id761576850640144" localize="false">ci = &h65 ' 6*16 + 5</paragraph>
+  <paragraph role="bascode" id="bas_id511576850640336" localize="false">MAX_Integer =  &o77777 '  32767 = &h7FFF</paragraph>
+  <paragraph role="bascode" id="bas_id571576850640536" localize="false">MIN_Integer = &o100000 ' -32768 = &h8000</paragraph>
+  <paragraph role="bascode" id="bas_id541576850641922" localize="false">MAX_Long = &h7fffffff '  2147483647 = &o17777777777</paragraph>
+  <paragraph role="bascode" id="bas_id481576850564801" localize="false">MIN_Long = &h80000000 ' -2147483648 = &o20000000000</paragraph>
+</bascode>
+
 <paragraph id="hd_id3148742" role="heading" level="3" xml-lang="en-US">String Variables</paragraph>
 <paragraph id="par_id3151393" role="paragraph" xml-lang="en-US">String variables can hold character strings with up to 65,535 characters. Each character is stored as the corresponding Unicode value. String variables are suitable for word processing within programs and for temporary storage of any non-printable character up to a maximum length of 64 Kbytes. The memory required for storing string variables depends on the number of characters in the variable. The type-declaration character is "$".</paragraph>
 <bascode>
