[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text
Steve Fanning (via logerrit)
logerrit at kemper.freedesktop.org
Wed Apr 8 22:33:52 UTC 2020
AllLangHelp_scalc.mk | 1
source/text/scalc/01/04060106.xhp | 50 ---------------
source/text/scalc/01/func_floor.xhp | 113 ++++++++++++++++++++++++++++++++++++
3 files changed, 114 insertions(+), 50 deletions(-)
New commits:
commit ef21ad9a4c0d9fb787392c5a6d24ebe9bb77309e
Author: Steve Fanning <stevemfanning.wh at gmail.com>
AuthorDate: Tue Apr 7 18:15:02 2020 -0300
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Thu Apr 9 00:33:31 2020 +0200
tdf#131960 Clarification of FLOOR functions
+ refactor, grouping all FLOOR variants into one file
Change-Id: I522674c51de531054991457cdc19a2245df4244d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/91856
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index aeee43364..d8660002b 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -204,6 +204,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
helpcontent2/source/text/scalc/01/func_eomonth \
helpcontent2/source/text/scalc/01/func_error_type \
helpcontent2/source/text/scalc/01/func_findb \
+ helpcontent2/source/text/scalc/01/func_floor \
helpcontent2/source/text/scalc/01/func_forecastetsadd \
helpcontent2/source/text/scalc/01/func_forecastetsmult \
helpcontent2/source/text/scalc/01/func_forecastetsstatadd \
diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp
index 0bd8172ee..36bde5f4d 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -1420,56 +1420,6 @@
<paragraph id="par_id5675527" role="paragraph" xml-lang="en-US"><item type="input">=ODD(-3.1)</item> returns -5.</paragraph><comment>see also CEILING, FLOOR, EVEN, MROUND, INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
</section>
-<section id="Section9.1">
-<bookmark xml-lang="en-US" branch="index" id="bm_id2957404">
- <bookmark_value>FLOOR.PRECISE function</bookmark_value>
- <bookmark_value>FLOOR.XCL function</bookmark_value>
- <bookmark_value>rounding;down to nearest multiple of significance</bookmark_value>
-</bookmark>
-<comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_FLOOR_MS" id="bm_id2957415" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_FLOOR_PRECISE" id="bm_id2957215" localize="false"/>
-
-<h2 id="hd_id2957404">FLOOR.PRECISE</h2>
-<paragraph id="par_id2957432" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_FLOOR_MS">Rounds a number down to the nearest multiple of Significance, regardless of sign of Significance</ahelp></paragraph>
-<embed href="text/scalc/00/avail_release.xhp#4.3"/>
-<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id2957464" role="code" xml-lang="en-US">FLOOR.PRECISE(Number; Significance)</paragraph>
-<paragraph id="par_id2957478" role="paragraph" xml-lang="en-US"><emph>Number</emph> is the number that is to be rounded down.</paragraph>
-<paragraph id="par_id2957497" role="paragraph" xml-lang="en-US"><emph>Significance</emph> is the value to whose multiple the number is to be rounded down.</paragraph>
-<embed href="text/scalc/01/04060106.xhp#floor_warn"/>
-<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
-<paragraph id="par_id2963945" role="paragraph" xml-lang="en-US"><item type="input">=FLOOR.PRECISE( -11;-2)</item> returns -12</paragraph><comment>see also CEILING, EVEN, ODD, MROUND,INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
-</section>
-
-<section id="Section9">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3157404">
- <bookmark_value>FLOOR function</bookmark_value>
- <bookmark_value>FLOOR.MATH function</bookmark_value>
- <bookmark_value>rounding;down to nearest multiple of significance</bookmark_value>
-</bookmark>
-<comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_UNTERGRENZE" id="bm_id3157415" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_FLOOR_MATH" id="bm_id3167415" localize="false"/>
-
-<h2 id="hd_id3157404">FLOOR</h2>
-<paragraph id="par_id3157432" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_UNTERGRENZE">Rounds a number down to the nearest multiple of Significance.</ahelp></paragraph>
-
-<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id3157464" role="code" xml-lang="en-US">FLOOR(Number; Significance; Mode)</paragraph>
-<paragraph id="par_id3157478" role="paragraph" xml-lang="en-US"><emph>Number</emph> is the number that is to be rounded down.</paragraph>
-<paragraph id="par_id3157497" role="paragraph" xml-lang="en-US"><emph>Significance</emph> is the value to whose multiple the number is to be rounded down.</paragraph>
-<paragraph id="par_id3157517" role="paragraph" xml-lang="en-US"><emph>Mode</emph> is an optional value. If the Mode value is given and not equal to zero, and if Number and Significance are negative, then rounding is done based on the absolute value of Number, i.e. negative numbers are rounded towards zero. If the Mode value is equal to zero or is not given, negative numbers are rounded away from zero.</paragraph>
-<section id="floor_warn">
- <warning id="par_id3163894">If the spreadsheet is exported to Microsoft Excel, the FLOOR function is exported as the equivalent FLOOR.MATH function that exists since Excel 2013. If you plan to use the spreadsheet with earlier Excel versions, use either FLOOR.PRECISE that exists since Excel 2010, or FLOOR.XCL that is exported as the FLOOR function compatible with all Excel versions. Note that FLOOR.XCL always rounds towards zero.</warning>
-</section>
-
-<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
-<paragraph id="par_id3163945" role="paragraph" xml-lang="en-US"><item type="input">=FLOOR( -11;-2)</item> returns -12</paragraph>
-<paragraph id="par_id3163966" role="paragraph" xml-lang="en-US"><item type="input">=FLOOR( -11;-2;0)</item> returns -12</paragraph>
-<paragraph id="par_id3163988" role="paragraph" xml-lang="en-US"><item type="input">=FLOOR( -11;-2;1)</item> returns -10</paragraph><comment>see also CEILING, EVEN, ODD, MROUND, INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
-</section>
-
<section id="Section8">
<bookmark xml-lang="en-US" branch="index" id="bm_id3164086">
<bookmark_value>SIGN function</bookmark_value>
diff --git a/source/text/scalc/01/func_floor.xhp b/source/text/scalc/01/func_floor.xhp
new file mode 100644
index 000000000..e56c0598b
--- /dev/null
+++ b/source/text/scalc/01/func_floor.xhp
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+ <!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ -->
+
+ <meta>
+ <topic id="scalcfloorfunctions" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">FLOOR Functions</title>
+ <filename>/text/scalc/01/func_floor.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <h1 id="hd_id391586285373874">FLOOR Functions</h1>
+
+ <section id="Section9">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3157404">
+<bookmark_value>FLOOR function</bookmark_value>
+<bookmark_value>rounding;down to nearest multiple of significance</bookmark_value>
+</bookmark>
+ <comment>mw added one entry</comment>
+ <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_UNTERGRENZE" id="bm_id3157415" localize="false"/>
+ <h2 id="hd_id3157404">FLOOR</h2>
+ <paragraph id="par_id3157432" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_UNTERGRENZE">Rounds a number to the nearest multiple of a significance value.</ahelp></paragraph>
+ <paragraph role="paragraph" id="par_id661586285977707">For a positive number and a positive significance value, the function rounds down (towards zero). For a negative number and a negative significance value, the direction of rounding is determined by the value of a mode parameter. The function returns an error if the number and significance values have opposite signs.</paragraph>
+ <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
+ <paragraph id="par_id3157464" role="code" xml-lang="en-US">FLOOR(Number[; Significance[; Mode]])</paragraph>
+ <section id="argnumber">
+ <paragraph id="par_id3153467" role="paragraph" xml-lang="en-US"><emph>Number</emph> is the number that is to be rounded, or a reference to a cell containing the number.</paragraph>
+ </section>
+ <paragraph id="par_id3157497" role="paragraph" xml-lang="en-US"><emph>Significance</emph> (optional) is the value, or a reference to a cell containing the value, to whose multiple <emph>Number</emph> is to be rounded. It defaults to +1 or -1 depending on the sign of <emph>Number</emph>.</paragraph>
+ <paragraph id="par_id3157517" role="paragraph" xml-lang="en-US"><emph>Mode</emph> (optional) is a number, or a reference to a cell containing a number. The function only uses <emph>Mode</emph> if both <emph>Number</emph> and <emph>Significance</emph> are negative. Then if <emph>Mode</emph> is given and not equal to zero, numbers are rounded up (towards zero); if <emph>Mode</emph> is equal to zero or not given, negative numbers are rounded down (away from zero).</paragraph>
+ <section id="floor_warn">
+ <warning id="par_id3163894">If the spreadsheet is exported to Microsoft Excel, the FLOOR function is exported as the equivalent FLOOR.MATH function that has existed since Excel 2013. If you plan to use the spreadsheet with earlier Excel versions, use either FLOOR.PRECISE that has existed since Excel 2010, or FLOOR.XCL that is exported as the FLOOR function compatible with all Excel versions.</warning>
+ </section>
+ <embed href="text/scalc/01/common_func.xhp#sectionexample"/>
+ <paragraph role="paragraph" id="par_id761586287595376"><input>=FLOOR(3.45)</input> returns 3.</paragraph>
+ <paragraph role="paragraph" id="par_id311586287600048"><input>=FLOOR(3.45, 3)</input> returns 3.</paragraph>
+ <paragraph role="paragraph" id="par_id661586287604519"><input>=FLOOR(-1.234)</input> returns -2.</paragraph>
+ <paragraph role="paragraph" id="par_id741586287608968"><input>=FLOOR(-45.67, -2, 0)</input> returns -46.</paragraph>
+ <paragraph role="paragraph" id="par_id431586287616089"><input>=FLOOR(-45.67, -2, 1)</input> returns -44.</paragraph>
+ <comment>see also CEILING, EVEN, ODD, MROUND, INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
+ </section>
+
+ <section id="floormath">
+<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_FLOOR_MATH" id="bm_id3167415" localize="false"/>
+<bookmark xml-lang="en-US" branch="index" id="bm_id811586290952465">
+<bookmark_value>FLOOR.MATH function</bookmark_value>
+</bookmark>
+ <h2 id="hd_id1001586287279297">FLOOR.MATH</h2>
+ <paragraph role="paragraph" id="par_id721586287302689">Rounds a number to the nearest multiple of a significance value.</paragraph>
+ <paragraph role="paragraph" id="par_id311586287323417">For a positive number the function rounds down (towards zero). For a negative number, the direction of rounding is determined by the value of a mode parameter. The sign of the significance value is ignored.</paragraph>
+ <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
+ <paragraph role="code" id="par_id161586287421523">FLOOR.MATH(Number[; Significance[; Mode]])</paragraph>
+ <embed href="text/scalc/01/func_floor.xhp#argnumber"/>
+ <paragraph role="paragraph" id="par_id231586287448716"><emph>Significance</emph> (optional) is the value, or a reference to a cell containing the value, to whose multiple <emph>Number</emph> is to be rounded. It defaults to 1.</paragraph>
+ <paragraph role="paragraph" id="par_id261586287494401"><emph>Mode</emph> (optional) is a number, or a reference to a cell containing a number. If <emph>Mode</emph> is given and not equal to zero, a negative <emph>Number</emph> is rounded up (towards zero). If <emph>Mode</emph> is equal to zero or is not given, a negative <emph>Number</emph> is rounded down (away from zero).</paragraph>
+ <warning id="par_id851586287535879">This function exists for interoperability with Microsoft Excel 2013 or newer.</warning>
+ <embed href="text/scalc/01/common_func.xhp#sectionexample"/>
+ <paragraph role="paragraph" id="par_id101586287621816"><input>=FLOOR.MATH(3.45)</input> returns 3.</paragraph>
+ <paragraph role="paragraph" id="par_id771586287627784"><input>=FLOOR.MATH(3.45,-3)</input> returns 3.</paragraph>
+ <paragraph role="paragraph" id="par_id981586287632392"><input>=FLOOR.MATH(-1.234)</input> returns -2.</paragraph>
+ <paragraph role="paragraph" id="par_id631586287637256"><input>=FLOOR.MATH(-45.67,-2, 0)</input> returns -46.</paragraph>
+ <paragraph role="paragraph" id="par_id371586287641888"><input>=FLOOR.MATH(-45.67,+2, 1)</input> returns -44.</paragraph>
+ </section>
+
+ <section id="Section9.1">
+<bookmark xml-lang="en-US" branch="index" id="bm_id2957404">
+<bookmark_value>FLOOR.PRECISE function</bookmark_value>
+<bookmark_value>rounding;down to nearest multiple of significance</bookmark_value>
+</bookmark>
+ <comment>mw added one entry</comment>
+ <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_FLOOR_MS" id="bm_id2957415" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_FLOOR_PRECISE" id="bm_id2957215" localize="false"/>
+
+ <h2 id="hd_id2957404">FLOOR.PRECISE</h2>
+ <paragraph id="par_id2957432" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_FLOOR_MS">Rounds a number down to the nearest multiple of a significance value.</ahelp></paragraph>
+ <embed href="text/scalc/00/avail_release.xhp#4.3"/>
+ <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
+ <paragraph id="par_id2957464" role="code" xml-lang="en-US">FLOOR.PRECISE(Number[; Significance])</paragraph>
+ <embed href="text/scalc/01/func_floor.xhp#argnumber"/>
+ <paragraph id="par_id2957497" role="paragraph" xml-lang="en-US"><emph>Significance</emph> (optional) is the value, or a reference to a cell containing the value, to whose multiple <emph>Number</emph> is to be rounded. It defaults to 1.</paragraph>
+ <embed href="text/scalc/01/func_floor.xhp#floor_warn"/>
+ <embed href="text/scalc/01/common_func.xhp#sectionexample"/>
+ <paragraph role="paragraph" id="par_id981586291388900"><input>=FLOOR.PRECISE(3.45)</input> returns 3.</paragraph>
+ <paragraph role="paragraph" id="par_id831586291395477"><input>=FLOOR.PRECISE(-45.67,2)</input> returns -46.</paragraph>
+ <comment>see also CEILING, EVEN, ODD, MROUND,INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
+ </section>
+
+ <section id="floorxcl">
+<bookmark xml-lang="en-US" branch="index" id="bm_id171586291849333">
+<bookmark_value>FLOOR.XCL function</bookmark_value>
+</bookmark>
+ <h2 id="hd_id791586291468176">FLOOR.XCL</h2>
+ <paragraph role="paragraph" id="par_id521586291476023">Rounds a number to the nearest multiple of a significance value.</paragraph>
+ <paragraph role="paragraph" id="par_id401586291488768">For a positive number and a positive significance value, the function rounds down (towards zero). For a negative number and a positive significance value, the function rounds down (away from zero). For a negative number and a negative significance value, the function rounds up (towards zero). The function returns an error if the number is positive and the significance value is negative.</paragraph>
+ <warning id="par_id231586291503319">This function exists for interoperability with Microsoft Excel 2007 or older. If a Calc spreadsheet is exported to Microsoft Excel, references to Calc’s FLOOR.XCL function are exported as references to Excel’s FLOOR function, which is compatible with all Excel versions. If a Microsoft Excel spreadsheet is imported into Calc, references to Excel’s FLOOR function are imported as references to Calc’s FLOOR.XCL function.</warning>
+ <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
+ <paragraph role="code" id="par_id491586291532177">FLOOR.XCL(Number; Significance)</paragraph>
+ <embed href="text/scalc/01/func_floor.xhp#argnumber"/>
+ <paragraph role="paragraph" id="par_id761586291578755"><emph>Significance</emph> is the value, or a reference to a cell containing the value, to whose multiple <emph>Number</emph> is to be rounded.</paragraph>
+ <embed href="text/scalc/01/common_func.xhp#sectionexample"/>
+ <paragraph role="paragraph" id="par_id531586291622306"><input>=FLOOR.XCL(3.45,2)</input> returns 2.</paragraph>
+ <paragraph role="paragraph" id="par_id361586291628003"><input>=FLOOR.XCL(-45.67,2)</input> returns -46.</paragraph>
+ <paragraph role="paragraph" id="par_id801586291641099"><input>=FLOOR.XCL(-45.67,-2)</input> returns -44.</paragraph>
+ </section>
+</body>
+</helpdocument>
More information about the Libreoffice-commits
mailing list