source/text/scalc/01/04060103.xhp | 5 ++---
source/text/scalc/01/04060105.xhp | 2 ++
source/text/scalc/01/04060106.xhp | 2 +-
source/text/scalc/01/04060107.xhp | 1 +
source/text/scalc/01/04060118.xhp | 1 +
source/text/scalc/01/04060119.xhp | 2 ++
6 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 155384c51ee22314c18a428ec7c1c773b222e804
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Sat Mar 27 21:38:17 2021 +0100
Commit: Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Sat Mar 27 22:11:07 2021 +0100
tdf#137715 add "text in data range" note to diverse functions
( scalc/01/04060118.xhp )
FVSCHEDULE
( scalc/01/04060103.xhp )
IRR
( scalc/01/04060105.xhp )
AND, OR
( scalc/01/04060106.xhp )
SUBTOTAL
( scalc/01/04060107.xhp )
FREQUENCY
( scalc/01/04060119.xhp )
NPV
Change-Id: I6b6fe55f232bf4aa5e66db1f7fb8e6f6255b15e9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/113219
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>
diff --git a/source/text/scalc/01/04060103.xhp
b/source/text/scalc/01/04060103.xhp
index 2ba1ed5d3..92438920f 100644
--- a/source/text/scalc/01/04060103.xhp
+++ b/source/text/scalc/01/04060103.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,7 +18,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
<meta>
<topic id="textscalc0104060103xml" indexer="include">
<title xml-lang="en-US" id="tit">Financial Functions Part One</title>
@@ -692,7 +690,7 @@
<bookmark xml-lang="en-US" branch="index"
id="bm_id3153948"><bookmark_value>IRR function</bookmark_value>
<bookmark_value>calculating;internal rates of return, regular
payments</bookmark_value>
<bookmark_value>internal rates of return;regular
payments</bookmark_value>
-</bookmark><comment>mw changed "calculating;..." and "internal rates"</comment>
+</bookmark>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_IKV" id="bm_id3148419"
localize="false"/>
<h2 id="hd_id3153948">IRR</h2>
<paragraph xml-lang="en-US" id="par_id3143282"
role="paragraph"><ahelp hid="HID_FUNC_IKV">Calculates the internal rate of
return for an investment.</ahelp> The values represent cash flow values at
regular intervals, at least one value must be negative (payments), and at least
one value must be positive (income).</paragraph>
@@ -703,6 +701,7 @@
<emph>Values</emph> represents an array containing the
values.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149233" role="paragraph">
<emph>Guess</emph> (optional) is the estimated value. An iterative
method is used to calculate the internal rate of return. If you can provide
only few values, you should provide an initial guess to enable the
iteration.</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_id3150630" role="paragraph">Under
the assumption that cell contents are A1=<item type="input">-10000</item>,
A2=<item type="input">3500</item>, A3=<item type="input">7600</item> and
A4=<item type="input">1000</item>, the formula <item
type="input">=IRR(A1:A4)</item> gives a result of 11,33%.</paragraph>
<warning id="par_id461513468030965">Because of the iterative method
used, it is possible for IRR to fail and return <link
href="text/scalc/05/02140000.xhp" name="Error 523">Error 523</link>, with
"Error: Calculation does not converge" in the status bar. In that case, try
another value for Guess.</warning>
diff --git a/source/text/scalc/01/04060105.xhp
b/source/text/scalc/01/04060105.xhp
index d42ad8e03..8351a7a8b 100644
--- a/source/text/scalc/01/04060105.xhp
+++ b/source/text/scalc/01/04060105.xhp
@@ -80,6 +80,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph xml-lang="en-US" id="par_id3159123"
role="code">AND(<embedvar href="text/scalc/01/ful_func.xhp#logical255_1"
markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#logical255"/>
+ <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_id3153123" role="paragraph">The
logical values of entries 12<13; 14>12, and 7<6 are to be
checked:</paragraph>
<paragraph xml-lang="en-US" id="par_id3145632" role="paragraph">
@@ -149,6 +150,7 @@
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph xml-lang="en-US" id="par_id3150468"
role="code">OR(<embedvar href="text/scalc/01/ful_func.xhp#logical255_1"
markup="keep"/>)</paragraph>
<embed href="text/scalc/01/ful_func.xhp#logical255"/>
+ <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_id3154870" role="paragraph">The
logical values of entries 12<11; 13>22, and 45=45 are to be
checked.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155371" role="paragraph">
diff --git a/source/text/scalc/01/04060106.xhp
b/source/text/scalc/01/04060106.xhp
index 700ace3e4..87a0983d2 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -1122,7 +1122,6 @@
<bookmark_value>filtered data; sums</bookmark_value>
<bookmark_value>SUBTOTAL function</bookmark_value>
</bookmark>
-<comment>mw made "sums..." a two level entry</comment>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_TEILERGEBNIS"
id="bm_id3165644" localize="false"/>
<h2 id="hd_id3165633">SUBTOTAL</h2>
@@ -1271,6 +1270,7 @@
<paragraph id="par_id20082017075115609" role="paragraph" xml-lang="en-US">Use
numbers 1-11 to include manually hidden rows or 101-111 to exclude them;
filtered-out cells are always excluded.</paragraph>
<paragraph id="par_id3143606" role="paragraph"
xml-lang="en-US"><emph>Range</emph> is the range whose cells are
included.</paragraph>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3143638" role="paragraph" xml-lang="en-US">You have a
table in the cell range A1:B6 containing a bill of material for 10 students.
Row 2 (Pen) is manually hidden. You want to see the sum of the figures that are
displayed; that is, just the subtotal for the filtered rows. In this case the
correct formula would be:</paragraph>
diff --git a/source/text/scalc/01/04060107.xhp
b/source/text/scalc/01/04060107.xhp
index 0c105cb68..aac9e7f59 100644
--- a/source/text/scalc/01/04060107.xhp
+++ b/source/text/scalc/01/04060107.xhp
@@ -351,6 +351,7 @@
<paragraph id="par_id3155498" role="code" xml-lang="en-US">FREQUENCY(Data;
Classes)</paragraph>
<paragraph id="par_id3154352" role="paragraph"
xml-lang="en-US"><emph>Data</emph> represents the reference to the values to be
counted.</paragraph>
<paragraph id="par_id3148402" role="paragraph"
xml-lang="en-US"><emph>Classes</emph> represents the array of the limit
values.</paragraph>
+ <embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<note id="par_idN10D71">You can find a general introduction to Array
functions at the top of this page.</note>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3155904" role="paragraph" xml-lang="en-US">In the
following table, column A lists unsorted measurement values. Column B contains
the upper limit you entered for the classes into which you want to divide the
data in column A. According to the limit entered in B1, the FREQUENCY function
returns the number of measured values less than or equal to 5. As the limit in
B2 is 10, the FREQUENCY function returns the second result as the number of
measured values that are greater than 5 and less than or equal to 10. The text
you entered in B6, ">25", is only for reference purposes.<comment>i77461:
replace old text: As the limit in B2 is 10, the FREQUENCY function returns the
second result as the number of measured values that are greater than 5 or
greater than or equal to 10.</comment></paragraph><comment>UFI: replace table
by picture</comment>
diff --git a/source/text/scalc/01/04060118.xhp
b/source/text/scalc/01/04060118.xhp
index 4f00a1500..48dd466e3 100644
--- a/source/text/scalc/01/04060118.xhp
+++ b/source/text/scalc/01/04060118.xhp
@@ -563,6 +563,7 @@
<paragraph id="par_id3148891" role="code"
xml-lang="en-US">FVSCHEDULE(Principal; Schedule)</paragraph>
<paragraph id="par_id3148904" role="paragraph"
xml-lang="en-US"><emph>Principal</emph> is the starting capital.</paragraph>
<paragraph id="par_id3148562" role="paragraph"
xml-lang="en-US"><emph>Schedule</emph> is a series of interest rates, for
example, as a range H3:H5 or as a (List) (see example).</paragraph>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3148638" role="paragraph" xml-lang="en-US">1000 currency
units have been invested in for three years. The interest rates were 3%, 4% and
5% per annum. What is the value after three years?</paragraph>
diff --git a/source/text/scalc/01/04060119.xhp
b/source/text/scalc/01/04060119.xhp
index 99f0d6fd5..fbbb1e8ae 100644
--- a/source/text/scalc/01/04060119.xhp
+++ b/source/text/scalc/01/04060119.xhp
@@ -336,6 +336,8 @@
<paragraph role="code" id="par_id3153321" xml-lang="en-US">NPV(Rate; <embedvar
href="text/scalc/01/ful_func.xhp#number254_1" markup="keep"/>)</paragraph>
<paragraph role="paragraph" id="par_id3150630"
xml-lang="en-US"><emph>Rate</emph> is the discount rate for a
period.</paragraph>
<embed href="text/scalc/01/ful_func.xhp#number254"/>
+<embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
+
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph role="paragraph" id="par_id3154800" xml-lang="en-US">What is the
net present value of periodic payments of 10, 20 and 30 currency units with a
discount rate of 8.75%. At time zero the costs were paid as -40 currency
units.</paragraph>
<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
