source/text/scalc/01/func_convert.xhp | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 4ce4649ea3b21406c4e95e81930097968cb95cf6
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Tue Jan 4 11:34:34 2022 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Thu Jan 6 14:45:02 2022 +0100
tdf#120247 Update CONVERT() Calc funct wrt ODFF1.3
Change-Id: I6c58f86c943cb41cb2f9161de630d3519aef9a86
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/127945
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/scalc/01/func_convert.xhp
b/source/text/scalc/01/func_convert.xhp
index 382c82cad..c422ba5bd 100644
--- a/source/text/scalc/01/func_convert.xhp
+++ b/source/text/scalc/01/func_convert.xhp
@@ -862,7 +862,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph id="par_id921213995456776" localize="false"
role="tablecontent">"atm" ; "at"</paragraph>
+ <paragraph id="par_id921213995456776" localize="false"
role="tablecontent">"atm" ; ("at")<sup>(1)</sup></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id888153229712212" role="tablecontent">Standard
atmosphere</paragraph>
@@ -916,6 +916,7 @@
</tablecell>
</tablerow>
</table>
+ <warning id="par_id911641306487164">1 - The "at" unit is deprecated. Use
"atm" instead.</warning>
<h3 id="hd_id61620426438099">Speed</h3>
<table id="tab_id699528473861629">
@@ -1208,7 +1209,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph id="par_id477248257624964" localize="false"
role="tablecontent">"Glass"</paragraph>
+ <paragraph id="par_id477248257624964" localize="false"
role="tablecontent">"Glass"<sup>(2)</sup></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id938562498562468" role="tablecontent">Australian
glass (200 milliliters)</paragraph>
@@ -1230,7 +1231,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph id="par_id584476153629656" localize="false"
role="tablecontent">"Humpen"</paragraph>
+ <paragraph id="par_id584476153629656" localize="false"
role="tablecontent">"Humpen"<sup>(2)</sup></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id347175644673122" role="tablecontent">Humpen (500
milliliters)</paragraph>
@@ -1296,7 +1297,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph id="par_id648645827638713" localize="false"
role="tablecontent">"Middy"</paragraph>
+ <paragraph id="par_id648645827638713" localize="false"
role="tablecontent">"Middy"<sup>(2)</sup></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id995778363641811" role="tablecontent">Australian
middy (285 milliliters)</paragraph>
@@ -1384,7 +1385,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph id="par_id828968322594669" localize="false"
role="tablecontent">"Schooner"</paragraph>
+ <paragraph id="par_id828968322594669" localize="false"
role="tablecontent">"Schooner"<sup>(2)</sup></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id653481929342877" role="tablecontent">Australian
schooner (425 milliliters)</paragraph>
@@ -1395,7 +1396,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph id="par_id377965813595534" localize="false"
role="tablecontent">"Sixpack"</paragraph>
+ <paragraph id="par_id377965813595534" localize="false"
role="tablecontent">"Sixpack"<sup>(2)</sup></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id912821548196546" role="tablecontent">Six pack (2
liters)</paragraph>
@@ -1482,7 +1483,7 @@
</tablecell>
</tablerow>
</table>
-
+ <note id="par_id671641306535516">2 - These units are not part of the
<emph>Open Document Format for Office Applications (OpenDocument) Version 1.3.
Part 4: Recalculated Formula (OpenFormula) Format</emph> standard for the
CONVERT function. They are preserved for backward compatibility.</note>
<section id="Prefixes">
<h2 id="hd_id21620415408286">Prefixes</h2>
</section>
