source/text/scalc/01/func_ceiling.xhp | 11 +++++------
source/text/scalc/01/func_floor.xhp | 12 +++++++-----
2 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 9426fd84810a8d785d896f008be8515ed94c7028
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Wed Apr 15 18:13:46 2020 +0100
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Wed Apr 15 19:39:59 2020 +0200
Typos and correction in page
Change-Id: I1382ca7a49475d11c3cf424bea9c2146e0d4466e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/92292
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/scalc/01/func_ceiling.xhp
b/source/text/scalc/01/func_ceiling.xhp
index 206ea0244..858fb4881 100644
--- a/source/text/scalc/01/func_ceiling.xhp
+++ b/source/text/scalc/01/func_ceiling.xhp
@@ -24,9 +24,9 @@
<comment>mw added one entry</comment>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_OBERGRENZE"
id="bm_id3152530" localize="false"/>
<h2 id="hd_id3152518"><variable id="CEILINGh1"><link
href="text/scalc/01/func_ceiling.xhp#ceiling"
name="CEILING">CEILING</link></variable></h2>
- <paragraph id="par_id3153422" role="paragraph" xml-lang="en-US"><ahelp
hid="HID_FUNC_OBERGRENZE">Rounds a number up to the nearest multiple of s
significance value.</ahelp></paragraph>
+ <paragraph id="par_id3153422" role="paragraph" xml-lang="en-US"><ahelp
hid="HID_FUNC_OBERGRENZE">Rounds a number to the nearest multiple of a
significance value.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id601586207136514">For a positive
number and a positive significance value, the function rounds up (away from
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>
- <warning id="par_id3163792">If the spreadsheet is exported to
Microsoft Excel, the CEILING function is exported as the equivalent
CEILING.MATH function that exists since Excel 2013. If you plan to use the
spreadsheet with earlier Excel versions, use either CEILING.PRECISE that exists
since Excel 2010, or CEILING.XCL that is exported as the CEILING function
compatible with all Excel versions. Note that CEILING.XCL always rounds away
from zero.</warning>
+ <warning id="par_id3163792">If the spreadsheet is exported to
Microsoft Excel, the CEILING function is exported as the equivalent
CEILING.MATH function that has existed since Excel 2013. If you plan to use the
spreadsheet with earlier Excel versions, use either CEILING.PRECISE that has
existed since Excel 2010, or CEILING.XCL that is exported as the CEILING
function compatible with all Excel versions.</warning>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id3153454" role="code"
xml-lang="en-US">CEILING(Number[; Significance[; Mode]])</paragraph>
<section id="argnumber">
@@ -59,7 +59,6 @@
<paragraph id="par_id2953454" role="code"
xml-lang="en-US">CEILING.PRECISE(Number[; Significance])</paragraph>
<embed href="text/scalc/01/func_ceiling.xhp#argnumber"/>
<paragraph id="par_id2955000" 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>
- <note id="par_id461586211894475">This function calculates identical
results to the ISO.CEILING function</note>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph role="paragraph"
id="par_id201586213398634"><input>=CEILING.PRECISE(3.45)</input> returns
4.</paragraph>
<paragraph role="paragraph"
id="par_id651586213406243"><input>=CEILING.PRECISE(-45.67,2)</input> returns
-44.</paragraph>
@@ -75,12 +74,12 @@
<paragraph role="paragraph" id="par_id81516997342088"
xml-lang="en-US"><ahelp hid="HID_FUNC_CEIL_MATH">Rounds a number to the nearest
multiple of a significance value.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id911586642319078">For a positive
number the function rounds up (away from 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/00/avail_release.xhp#5.0"/>
- <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
+ <warning id="par_id291516998575663">This function exists for
interoperability with Microsoft Excel 2013 or newer.</warning>
+ <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph role="code" id="par_id841516997669932"
xml-lang="en-US">CEILING.MATH(Number[; Significance[; Mode]])</paragraph>
<embed href="text/scalc/01/func_ceiling.xhp#argnumber"/>
<paragraph role="paragraph" id="par_id491516997725772"
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>
<paragraph role="paragraph" id="par_id451516997742909"
xml-lang="en-US"><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 down (away from zero). If
<emph>Mode</emph> is equal to zero or is not given, a negative
<emph>Number</emph> is rounded up (towards zero).</paragraph>
- <warning id="par_id291516998575663">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_id331586208590009"><input>=CEILING.MATH(3.45)</input> returns
4.</paragraph>
<paragraph role="paragraph"
id="par_id481586208595809"><input>=CEILING.MATH(3.45,-3)</input> returns
6.</paragraph>
@@ -125,7 +124,7 @@
<paragraph id="par_id8955000" 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/common_func.xhp#sectionexample"/>
<paragraph role="paragraph"
id="par_id801586214431463"><input>=ISO.CEILING(3.45)</input> returns
4.</paragraph>
- <paragraph role="paragraph"
id="par_id181586214438808"><input>=ISO.CEILING(-45.67,2)</input> returns
44.</paragraph>
+ <paragraph role="paragraph"
id="par_id181586214438808"><input>=ISO.CEILING(-45.67,2)</input> returns
-44.</paragraph>
<comment>see also FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND,
ROUNDDOWN, ROUNDUP</comment>
</section>
<section id="relatedtopics">
diff --git a/source/text/scalc/01/func_floor.xhp
b/source/text/scalc/01/func_floor.xhp
index 3d7e738e5..922bad335 100644
--- a/source/text/scalc/01/func_floor.xhp
+++ b/source/text/scalc/01/func_floor.xhp
@@ -26,16 +26,17 @@
<h2 id="hd_id3157404"><variable id="FLOORh1"><link
href="text/scalc/01/func_floor.xhp#floor"
name="FLOOR">FLOOR</link></variable></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"/>
+ <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#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>
@@ -81,11 +82,12 @@
<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>
<paragraph role="paragraph" id="par_id261586641501175">For a positive
number the function rounds down (towards zero). For a negative number, the
function rounds down (away form zero). The sign of the significance value is
ignored.</paragraph>
<embed href="text/scalc/00/avail_release.xhp#4.3"/>
+ <embed href="text/scalc/01/func_floor.xhp#floor_warn"/>
<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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
