source/text/scalc/01/04060106.xhp | 8 ++++++--
source/text/scalc/01/04060184.xhp | 9 +++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 9535013762e34c86cc4fa19a1ae94d346899a821
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Sat Mar 27 16:32:13 2021 +0100
Commit: Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Sat Mar 27 22:10:12 2021 +0100
tdf#137715 text in range note for SUM, AVERAGE, SUMSQ, PRODUCT
This patch started as a repair for the revert of
11e69d34205bf773f2aa4f4be5c8fa08566ed7d7
by using a new approach to adding a note for SUM, AVERAGE,
SUMSQ, and PRODUCT.
Because some other functions in the same files also need
the note, they were included as part of this patch.
The additional functions are:
( scalc/01/04060184.xhp )
MODE, QUARTILE, AVEDEV, MAX, MEDIAN, MIN, PERCENTILE,and
PERCENTRANK
( scalc/01/04060106.xhp )
MULTINOMIAL, GCD, LCM
Change-Id: I969a65a6410372561de4df39444cdac9b4bc96f6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/113215
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>
diff --git a/source/text/scalc/01/04060106.xhp
b/source/text/scalc/01/04060106.xhp
index 46f21ba8a..700ace3e4 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -505,6 +505,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id3154524" role="code" xml-lang="en-US">GCD(<embedvar
href="text/scalc/01/ful_func.xhp#integer255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#integer255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3151285" role="paragraph" xml-lang="en-US"><item
type="input">=GCD(16;32;24) </item>gives the result 8, because 8 is the largest
number that can divide 16, 24 and 32 without a remainder.</paragraph>
@@ -541,6 +542,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id3147279" role="code" xml-lang="en-US">LCM(<embedvar
href="text/scalc/01/ful_func.xhp#integer255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#integer255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3154914" role="paragraph" xml-lang="en-US">If you enter
the numbers 512; 1024 and 2000 as Integer 1;2 and 3, then 128000 will be
returned.</paragraph>
@@ -716,6 +718,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id3155660" role="code"
xml-lang="en-US">MULTINOMIAL(<embedvar
href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3155701" role="paragraph" xml-lang="en-US"><item
type="input">=MULTINOMIAL(F11:H11)</item> returns 1260, if F11 to H11 contain
the values <item type="input">2</item>, <item type="input">3</item> and <item
type="input">4</item>. This corresponds to the formula =(2+3+4)! /
(2!*3!*4!)</paragraph>
</section>
@@ -775,6 +778,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id3144446" role="code" xml-lang="en-US">PRODUCT(<embedvar
href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3144494" role="paragraph" xml-lang="en-US"><item
type="input">=PRODUCT(2;3;4)</item> returns 24.</paragraph><comment>see also
FACT, SUM</comment>
</section>
@@ -793,6 +797,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id3160402" role="code" xml-lang="en-US">SUMSQ(<embedvar
href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3160449" role="paragraph" xml-lang="en-US">If you enter
the numbers 2; 3 and 4 in the Number 1; 2 and 3 arguments, 29 is returned as
the result.</paragraph>
</section>
@@ -802,7 +807,6 @@
<bookmark_value>MOD function</bookmark_value>
<bookmark_value>remainders of divisions</bookmark_value>
</bookmark>
-<comment>mw added one entry</comment>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_REST" id="bm_id3158259"
localize="false"/>
<h2 id="hd_id3158247">MOD</h2>
@@ -1023,7 +1027,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id3163656" role="code" xml-lang="en-US">SUM(<embedvar
href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number255"/>
-<tip id="par_id151567608802604">SUM ignores any text or empty cell within a
range or array. If you suspect wrong results of the SUM function, look for text
in the data ranges. Use the <link href="text/scalc/01/03080000.xhp" name="value
highlight">value highlighting</link> feature to highlight the text contents in
the range that may represent a number.</tip>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3163704" role="paragraph" xml-lang="en-US">If you enter
the numbers <item type="input">2</item>; <item type="input">3 </item>and <item
type="input">4</item> in the Number 1; 2 and 3 text boxes, 9 will be returned
as the result.</paragraph>
<paragraph id="par_id3151740" role="paragraph" xml-lang="en-US"><item
type="input">=SUM(A1;A3;B5)</item> calculates the sum of the three cells. <item
type="input">=SUM (A1:E10)</item> calculates the sum of all cells in the A1 to
E10 cell range.</paragraph>
diff --git a/source/text/scalc/01/04060184.xhp
b/source/text/scalc/01/04060184.xhp
index 4cc4f0ec5..a2faa30e4 100644
--- a/source/text/scalc/01/04060184.xhp
+++ b/source/text/scalc/01/04060184.xhp
@@ -40,6 +40,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph xml-lang="en-US" id="par_id3147340" role="code">MAX(<embedvar
href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph xml-lang="en-US" id="par_id3147343" role="paragraph">
<item type="input">=MAX(A1;A2;A3;50;100;200)</item> returns the largest value
from the list.</paragraph>
@@ -71,6 +72,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph xml-lang="en-US" id="par_id3155264" role="code">MEDIAN(<embedvar
href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph xml-lang="en-US" id="par_id3145078" role="paragraph">for an odd
number: <item type="input">=MEDIAN(1;5;9;20;21)</item> returns 9 as the median
value.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149126" role="paragraph">for an even
number: <item type="input">=MEDIAN(1;5;9;20)</item> returns the average of the
two middle values 5 and 9, thus 7.</paragraph>
@@ -85,6 +87,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph xml-lang="en-US" id="par_id3146964" role="code">MIN(<embedvar
href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph xml-lang="en-US" id="par_id3154734" role="paragraph">
<item type="input">=MIN(A1:B100)</item> returns the smallest value in the
list.</paragraph>
@@ -115,6 +118,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph role="code" id="par_id3145636" xml-lang="en-US">AVEDEV(<embedvar
href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph role="paragraph" id="par_id3153122" xml-lang="en-US"><item
type="input">=AVEDEV(A1:A50)</item> </paragraph>
</section>
@@ -127,6 +131,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph xml-lang="en-US" id="par_id3154679" role="code">AVERAGE(<embedvar
href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph xml-lang="en-US" id="par_id3151232" role="paragraph">
<item type="input">=AVERAGE(A1:A50)</item>
@@ -165,6 +170,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph xml-lang="en-US" id="par_id3155950" role="code">MODE(<embedvar
href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number255"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph xml-lang="en-US" id="par_id3153733" role="paragraph">
<item type="input">=MODE(A1:A50)</item>
@@ -382,6 +388,7 @@
<paragraph xml-lang="en-US" id="par_id3148813" role="code">PERCENTILE(Data;
Alpha)</paragraph>
<paragraph xml-lang="en-US" id="par_id3153054"
role="paragraph"><emph>Data</emph> represents the array of data.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154212"
role="paragraph"><emph>Alpha</emph> represents the percentage of the scale
between 0 and 1.</paragraph>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph xml-lang="en-US" id="par_id3159147" role="paragraph">
<item type="input">=PERCENTILE(A1:A50;0.1)</item> represents the value in the
data set, which equals 10% of the total data scale in A1:A50.</paragraph>
@@ -428,6 +435,7 @@
<paragraph xml-lang="en-US" id="par_id3154266"
role="paragraph"><emph>Data</emph> represents the array of data in the
sample.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148475"
role="paragraph"><emph>Value</emph> represents the value whose percentile rank
must be determined.</paragraph>
<paragraph xml-lang="en-US" id="par_id2748477"
role="paragraph"><emph>Significance</emph> An optional argument that specifies
the number of significant digits that the returned percentage value is rounded
to. If omitted, a value of 3 is used.</paragraph>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph xml-lang="en-US" id="par_id3149163" role="paragraph">
<item type="input">=PERCENTRANK(A1:A50;50)</item> returns the percentage rank
of the value 50 from the total range of all values found in A1:A50. If 50 falls
outside the total range, an error message will appear.</paragraph>
@@ -472,6 +480,7 @@
<paragraph xml-lang="en-US" id="par_id3153684" role="code">QUARTILE(Data;
Type)</paragraph>
<paragraph xml-lang="en-US" id="par_id3153387"
role="paragraph"><emph>Data</emph> represents the array of data in the
sample.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155589"
role="paragraph"><emph>Type</emph> represents the type of quartile. (0 = MIN, 1
= 25%, 2 = 50% (MEDIAN), 3 = 75% and 4 = MAX.)</paragraph>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph xml-lang="en-US" id="par_id3159276" role="paragraph">
<item type="input">=QUARTILE(A1:A50;2)</item> returns the value of which 50%
of the scale corresponds to the lowest to highest values in the range
A1:A50.</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
