summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Horacek <stanislav.horacek@gmail.com>2015-02-28 15:27:34 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-02-28 16:59:01 +0000
commit2f84d05cecc0265902c5df3afc22adf8a046a3c1 (patch)
treea3d6d1249da8aba4626a08f118967fcd3b0283af
parent649cf89040199e5dee52a195768a0e6688b6d420 (diff)
related tdf#69685 tdf#70733 move functions to appropriate categories
Change-Id: I85624c210d87e9cccaf7ddd3db53b52f37f4fb34 Reviewed-on: https://gerrit.libreoffice.org/14680 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--source/text/scalc/01/04060104.xhp44
-rw-r--r--source/text/scalc/01/04060106.xhp98
-rw-r--r--source/text/scalc/01/04060181.xhp43
3 files changed, 87 insertions, 98 deletions
diff --git a/source/text/scalc/01/04060104.xhp b/source/text/scalc/01/04060104.xhp
index 5ea5463000..0859780a3d 100644
--- a/source/text/scalc/01/04060104.xhp
+++ b/source/text/scalc/01/04060104.xhp
@@ -371,6 +371,29 @@
<paragraph role="paragraph" id="par_id3159182" xml-lang="en-US" l10n="CHG" oldref="67">
<item type="input">=ISFORMULA(C4)</item> returns FALSE if the cell C4 contains the number <item type="input">5</item>.</paragraph>
</section>
+<section id="iseven">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156048"><bookmark_value>ISEVEN function</bookmark_value>
+<bookmark_value>even integers</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTGERADE" id="bm_id3149430" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156048" role="heading" level="2">ISEVEN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149169" role="paragraph"><ahelp hid="HID_FUNC_ISTGERADE">Returns TRUE if the value is an even integer, or FALSE if the value is odd.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146928" role="heading" level="3">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151203" role="code">ISEVEN(Value)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150491" role="paragraph"><emph>Value</emph> is the value to be checked.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3445844" role="paragraph">If Value is not an integer any digits after the decimal point are ignored. The sign of Value is also ignored.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154136" role="heading" level="3">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163813" role="paragraph">
+<item type="input">=ISEVEN(48)</item> returns TRUE</paragraph>
+<paragraph xml-lang="en-US" id="par_id8378856" role="paragraph">
+<item type="input">=ISEVEN(33)</item> returns FALSE</paragraph>
+<paragraph xml-lang="en-US" id="par_id7154759" role="paragraph">
+<item type="input">=ISEVEN(0)</item> returns TRUE</paragraph>
+<paragraph xml-lang="en-US" id="par_id1912289" role="paragraph">
+<item type="input">=ISEVEN(-2.1)</item> returns TRUE</paragraph>
+<paragraph xml-lang="en-US" id="par_id5627307" role="paragraph">
+<item type="input">=ISEVEN(3.999)</item> returns FALSE</paragraph><comment>see also ISODD </comment>
+</section>
<section id="iseven_add">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149760"><bookmark_value>ISEVEN_ADD function</bookmark_value>
</bookmark>
@@ -475,6 +498,27 @@
<paragraph role="paragraph" id="par_id3148416" xml-lang="en-US" l10n="CHG" oldref="108">
<item type="input">=ISTEXT(C3)</item> returns FALSE if cell C3 contains the number <item type="input">3</item>.</paragraph>
</section>
+<section id="isodd">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156034"><bookmark_value>ISODD function</bookmark_value>
+<bookmark_value>odd integers</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTUNGERADE" id="bm_id3149298" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156034" role="heading" level="2">ISODD</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155910" role="paragraph"><ahelp hid="HID_FUNC_ISTUNGERADE">Returns TRUE if the value is odd, or FALSE if the number is even.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3151006" role="heading" level="3">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151375" role="code">ISODD(value)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155139" role="paragraph"><emph>Value</emph> is the value to be checked.</paragraph>
+<paragraph xml-lang="en-US" id="par_id9027680" role="paragraph">If Value is not an integer any digits after the decimal point are ignored. The sign of Value is also ignored.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163723" role="heading" level="3">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155345" role="paragraph">
+<item type="input">=ISODD(33)</item> returns TRUE</paragraph>
+<paragraph xml-lang="en-US" id="par_id9392986" role="paragraph">
+<item type="input">=ISODD(48)</item> returns FALSE</paragraph>
+<paragraph xml-lang="en-US" id="par_id5971251" role="paragraph">
+<item type="input">=ISODD(3.999)</item> returns TRUE</paragraph>
+<paragraph xml-lang="en-US" id="par_id4136478" role="paragraph">
+<item type="input">=ISODD(-3.1)</item> returns TRUE</paragraph><comment>see also ISEVEN</comment>
+</section>
<section id="isodd_add">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153939"><bookmark_value>ISODD_ADD function</bookmark_value>
</bookmark>
diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp
index 9329c36630..d08f30c95d 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -57,24 +57,6 @@ oldref="38">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id320139" role="paragraph" l10n="NEW">
<item type="input">=ABS(0)</item> returns 0.<comment>see also SIGN</comment></paragraph>
</section>
-<section id="Section62">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150896"><bookmark_value>COUNTBLANK function</bookmark_value>
-<bookmark_value>counting;empty cells</bookmark_value>
-<bookmark_value>empty cells;counting</bookmark_value>
-</bookmark><comment>mw added two entries</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ANZAHLLEEREZELLEN" id="bm_id3149730" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3150896" role="heading" level="2" l10n="U"
-oldref="42">COUNTBLANK</paragraph>
-<paragraph xml-lang="en-US" id="par_id3155260" role="paragraph" l10n="CHG" oldref="43"><ahelp hid="HID_FUNC_ANZAHLLEEREZELLEN">Returns the number of empty cells.</ahelp></paragraph>
-<paragraph xml-lang="en-US" id="hd_id3145144" role="heading" level="3" l10n="U"
-oldref="44">Syntax</paragraph>
-<paragraph xml-lang="en-US" id="par_id3153931" role="code" l10n="U" oldref="45">COUNTBLANK(Range)</paragraph>
-<paragraph xml-lang="en-US" id="par_id3149512" role="paragraph" l10n="CHG" oldref="46"> Returns the number of empty cells in the cell range <emph>Range</emph>.</paragraph>
-<paragraph xml-lang="en-US" id="hd_id3146139" role="heading" level="3" l10n="U"
-oldref="47">Example</paragraph>
-<paragraph xml-lang="en-US" id="par_id3148586" role="paragraph" l10n="CHG" oldref="48">
-<item type="input">=COUNTBLANK(A1:B2)</item> returns 4 if cells A1, A2, B1, and B2 are all empty.</paragraph><comment>see also COUNTIF</comment>
-</section>
<section id="Section61">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153114"><bookmark_value>ACOS function</bookmark_value>
</bookmark>
@@ -497,56 +479,6 @@ oldref="682">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3159192" role="paragraph" l10n="U" oldref="683">
<item type="input">=GCD_ADD(5;15;25)</item> returns 5.</paragraph>
</section>
-<section id="Section41">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156048"><bookmark_value>ISEVEN function</bookmark_value>
-<bookmark_value>even integers</bookmark_value>
-</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTGERADE" id="bm_id3149430" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3156048" role="heading" level="2" l10n="U"
-oldref="245">ISEVEN<comment>link from Information cat</comment></paragraph>
-<paragraph xml-lang="en-US" id="par_id3149169" role="paragraph" l10n="U" oldref="246"><ahelp hid="HID_FUNC_ISTGERADE">Returns TRUE if the value is an even integer, or FALSE if the value is odd.</ahelp></paragraph>
-<paragraph xml-lang="en-US" id="hd_id3146928" role="heading" level="3" l10n="U"
-oldref="247">Syntax</paragraph>
-<paragraph xml-lang="en-US" id="par_id3151203" role="code" l10n="U" oldref="248">ISEVEN(Value)</paragraph>
-<paragraph xml-lang="en-US" id="par_id3150491" role="paragraph" l10n="U" oldref="249"><emph>Value</emph> is the value to be checked.</paragraph>
-<paragraph xml-lang="en-US" id="par_id3445844" role="paragraph" l10n="NEW">If Value is not an integer any digits after the decimal point are ignored. The sign of Value is also ignored.</paragraph>
-<paragraph xml-lang="en-US" id="hd_id3154136" role="heading" level="3" l10n="U"
-oldref="250">Example</paragraph>
-<paragraph xml-lang="en-US" id="par_id3163813" role="paragraph" l10n="CHG" oldref="251">
-<item type="input">=ISEVEN(48)</item> returns TRUE</paragraph>
-<paragraph xml-lang="en-US" id="par_id8378856" role="paragraph" l10n="NEW">
-<item type="input">=ISEVEN(33)</item> returns FALSE</paragraph>
-<paragraph xml-lang="en-US" id="par_id7154759" role="paragraph" l10n="NEW">
-<item type="input">=ISEVEN(0)</item> returns TRUE</paragraph>
-<paragraph xml-lang="en-US" id="par_id1912289" role="paragraph" l10n="NEW">
-<item type="input">=ISEVEN(-2.1)</item> returns TRUE</paragraph>
-<paragraph xml-lang="en-US" id="par_id5627307" role="paragraph" l10n="NEW">
-<item type="input">=ISEVEN(3.999)</item> returns FALSE</paragraph><comment>see also ISODD </comment>
-</section>
-<section id="Section40">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156034"><bookmark_value>ISODD function</bookmark_value>
-<bookmark_value>odd integers</bookmark_value>
-</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTUNGERADE" id="bm_id3149298" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3156034" role="heading" level="2" l10n="U"
-oldref="255">ISODD<comment>link from Information cat</comment></paragraph>
-<paragraph xml-lang="en-US" id="par_id3155910" role="paragraph" l10n="U" oldref="256"><ahelp hid="HID_FUNC_ISTUNGERADE">Returns TRUE if the value is odd, or FALSE if the number is even.</ahelp></paragraph>
-<paragraph xml-lang="en-US" id="hd_id3151006" role="heading" level="3" l10n="U"
-oldref="257">Syntax</paragraph>
-<paragraph xml-lang="en-US" id="par_id3151375" role="code" l10n="U" oldref="258">ISODD(value)</paragraph>
-<paragraph xml-lang="en-US" id="par_id3155139" role="paragraph" l10n="U" oldref="259"><emph>Value</emph> is the value to be checked.</paragraph>
-<paragraph xml-lang="en-US" id="par_id9027680" role="paragraph" l10n="NEW">If Value is not an integer any digits after the decimal point are ignored. The sign of Value is also ignored.</paragraph>
-<paragraph xml-lang="en-US" id="hd_id3163723" role="heading" level="3" l10n="U"
-oldref="260">Example</paragraph>
-<paragraph xml-lang="en-US" id="par_id3155345" role="paragraph" l10n="CHG" oldref="261">
-<item type="input">=ISODD(33)</item> returns TRUE</paragraph>
-<paragraph xml-lang="en-US" id="par_id9392986" role="paragraph" l10n="NEW">
-<item type="input">=ISODD(48)</item> returns FALSE</paragraph>
-<paragraph xml-lang="en-US" id="par_id5971251" role="paragraph" l10n="NEW">
-<item type="input">=ISODD(3.999)</item> returns TRUE</paragraph>
-<paragraph xml-lang="en-US" id="par_id4136478" role="paragraph" l10n="NEW">
-<item type="input">=ISODD(-3.1)</item> returns TRUE</paragraph><comment>see also ISEVEN</comment>
-</section>
<section id="Section39">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145213"><bookmark_value>LCM function</bookmark_value>
<bookmark_value>least common multiples</bookmark_value>
@@ -1494,36 +1426,6 @@ oldref="545">Syntax</paragraph>
<item type="input">=RAND()</item> returns a random number between 0 and 1.</paragraph><comment>see also RANDBETWEEN
</comment>
</section>
-<section id="Section2">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3164897"><bookmark_value>COUNTIF function</bookmark_value>
-<bookmark_value>counting;specified cells</bookmark_value>
-</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ZAEHLENWENN" id="bm_id3164909" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3164897" role="heading" level="2" l10n="U"
-oldref="547">COUNTIF</paragraph>
-<paragraph xml-lang="en-US" id="par_id3164926" role="paragraph" l10n="CHG" oldref="548"><ahelp hid="HID_FUNC_ZAEHLENWENN">Returns the number of cells that meet with certain criteria within a cell range.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph xml-lang="en-US" id="hd_id3164953" role="heading" level="3" l10n="U"
-oldref="549">Syntax</paragraph>
-<paragraph xml-lang="en-US" id="par_id3164967" role="code" l10n="U" oldref="550">COUNTIF(Range; Criteria)</paragraph>
-<paragraph xml-lang="en-US" id="par_id3164980" role="paragraph" l10n="U" oldref="551"><emph>Range</emph> is the range to which the criteria are to be applied.</paragraph>
-<paragraph xml-lang="en-US" id="par_id3165000" role="paragraph" l10n="CHG" oldref="552"><emph>Criteria</emph> indicates the criteria in the form of a number, an expression or a character string. These criteria determine which cells are counted. You may also enter a search text in the form of a regular expression, e.g. b.* for all words that begin with b. You may also indicate a cell range that contains the search criterion. If you search for literal text, enclose the text in double quotes.</paragraph>
-<paragraph xml-lang="en-US" id="hd_id3165037" role="heading" level="3" l10n="U"
-oldref="553">Example</paragraph>
-<paragraph xml-lang="en-US" id="par_id3166505" role="paragraph" l10n="CHG" oldref="627">A1:A10 is a cell range containing the numbers <item type="input">2000</item> to <item type="input">2009</item>. Cell B1 contains the number <item type="input">2006</item>. In cell B2, you enter a formula:</paragraph>
-<paragraph xml-lang="en-US" id="par_id3581652" role="paragraph" l10n="NEW">
-<item type="input">=COUNTIF(A1:A10;2006)</item> - this returns 1</paragraph>
-<paragraph xml-lang="en-US" id="par_id708639" role="paragraph" l10n="NEW">
-<item type="input">=COUNTIF(A1:A10;B1)</item> - this returns 1</paragraph>
-<paragraph xml-lang="en-US" id="par_id5169225" role="paragraph" l10n="NEW">
-<item type="input">=COUNTIF(A1:A10;"&gt;=2006") </item>- this returns 4</paragraph>
-<paragraph xml-lang="en-US" id="par_id2118594" role="paragraph" l10n="NEW">
-<item type="input">=COUNTIF(A1:A10;"&lt;"&amp;B1)</item> - when B1 contains <item type="input">2006</item>, this returns 6</paragraph>
-<paragraph xml-lang="en-US" id="par_id166020" role="paragraph" l10n="NEW">
-<item type="input">=COUNTIF(A1:A10;C2)</item> where cell C2 contains the text <item type="input">&gt;2006</item> counts the number of cells in the range A1:A10 which are &gt;2006 </paragraph>
-<paragraph xml-lang="en-US" id="par_id6386913" role="paragraph" l10n="NEW">To count only negative numbers: <item type="input">=COUNTIF(A1:A10;"&lt;0")</item>
-</paragraph>
-</section>
</sort>
<section id="relatedtopics">
<embed href="text/scalc/01/04060100.xhp#drking"/>
diff --git a/source/text/scalc/01/04060181.xhp b/source/text/scalc/01/04060181.xhp
index 6505696b67..a27a4c3051 100644
--- a/source/text/scalc/01/04060181.xhp
+++ b/source/text/scalc/01/04060181.xhp
@@ -88,6 +88,49 @@
<paragraph xml-lang="en-US" id="par_id3158000" role="paragraph" l10n="U" oldref="29">
<item type="input">=COUNTA(2;4;6;"eight")</item> = 4. The count of values is therefore 4.</paragraph>
</section>
+<section id="countblank">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3150896"><bookmark_value>COUNTBLANK function</bookmark_value>
+<bookmark_value>counting;empty cells</bookmark_value>
+<bookmark_value>empty cells;counting</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ANZAHLLEEREZELLEN" id="bm_id3149730" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150896" role="heading" level="2">COUNTBLANK</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155260" role="paragraph"><ahelp hid="HID_FUNC_ANZAHLLEEREZELLEN">Returns the number of empty cells.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145144" role="heading" level="3">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153931" role="code">COUNTBLANK(Range)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149512" role="paragraph">Returns the number of empty cells in the cell range <emph>Range</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146139" role="heading" level="3">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148586" role="paragraph">
+<item type="input">=COUNTBLANK(A1:B2)</item> returns 4 if cells A1, A2, B1, and B2 are all empty.</paragraph><comment>see also COUNTIF</comment>
+</section>
+<section id="countif">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3164897"><bookmark_value>COUNTIF function</bookmark_value>
+<bookmark_value>counting;specified cells</bookmark_value>
+</bookmark><comment>mw added one entry</comment>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ZAEHLENWENN" id="bm_id3164909" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3164897" role="heading" level="2" l10n="U"
+oldref="547">COUNTIF</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164926" role="paragraph"><ahelp hid="HID_FUNC_ZAEHLENWENN">Returns the number of cells that meet with certain criteria within a cell range.</ahelp></paragraph>
+<embed href="text/shared/00/00000001.xhp#regulaer"/>
+<paragraph xml-lang="en-US" id="hd_id3164953" role="heading" level="3">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164967" role="code">COUNTIF(Range; Criteria)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164980" role="paragraph"><emph>Range</emph> is the range to which the criteria are to be applied.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165000" role="paragraph"><emph>Criteria</emph> indicates the criteria in the form of a number, an expression or a character string. These criteria determine which cells are counted. You may also enter a search text in the form of a regular expression, e.g. b.* for all words that begin with b. You may also indicate a cell range that contains the search criterion. If you search for literal text, enclose the text in double quotes.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3165037" role="heading" level="3">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3166505" role="paragraph">A1:A10 is a cell range containing the numbers <item type="input">2000</item> to <item type="input">2009</item>. Cell B1 contains the number <item type="input">2006</item>. In cell B2, you enter a formula:</paragraph>
+<paragraph xml-lang="en-US" id="par_id3581652" role="paragraph">
+<item type="input">=COUNTIF(A1:A10;2006)</item> - this returns 1</paragraph>
+<paragraph xml-lang="en-US" id="par_id708639" role="paragraph">
+<item type="input">=COUNTIF(A1:A10;B1)</item> - this returns 1</paragraph>
+<paragraph xml-lang="en-US" id="par_id5169225" role="paragraph">
+<item type="input">=COUNTIF(A1:A10;"&gt;=2006") </item>- this returns 4</paragraph>
+<paragraph xml-lang="en-US" id="par_id2118594" role="paragraph">
+<item type="input">=COUNTIF(A1:A10;"&lt;"&amp;B1)</item> - when B1 contains <item type="input">2006</item>, this returns 6</paragraph>
+<paragraph xml-lang="en-US" id="par_id166020" role="paragraph">
+<item type="input">=COUNTIF(A1:A10;C2)</item> where cell C2 contains the text <item type="input">&gt;2006</item> counts the number of cells in the range A1:A10 which are &gt;2006 </paragraph>
+<paragraph xml-lang="en-US" id="par_id6386913" role="paragraph">To count only negative numbers: <item type="input">=COUNTIF(A1:A10;"&lt;0")</item>
+</paragraph>
+</section>
<section id="b">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150267"><bookmark_value>B function</bookmark_value>
<bookmark_value>probabilities of samples with binomial distribution</bookmark_value>