summaryrefslogtreecommitdiffstats
path: root/helpcontent2/source/text/scalc/01/04060116.xhp
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/scalc/01/04060116.xhp')
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060116.xhp30
1 files changed, 23 insertions, 7 deletions
diff --git a/helpcontent2/source/text/scalc/01/04060116.xhp b/helpcontent2/source/text/scalc/01/04060116.xhp
index c416f15632..b03519e274 100755
--- a/helpcontent2/source/text/scalc/01/04060116.xhp
+++ b/helpcontent2/source/text/scalc/01/04060116.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -392,10 +392,11 @@
<item type="input">=OCT2HEX(144;4)</item> returns 0064.</paragraph>
</section>
<section id="convertadd">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3148446"><bookmark_value>CONVERT function</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148446"><bookmark_value>CONVERT_ADD function</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_CONVERT" id="bm_id3150773" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3148446" role="heading" level="2" oldref="175">CONVERT<comment>was CONVERT_ADD before. Now CONVERT was changed to EUROCONVERT, and CONVERT_ADD was changed to CONVERT</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148446" role="heading" level="2" l10n="CHG"
+ oldref="175">CONVERT_ADD</paragraph>
<paragraph xml-lang="en-US" id="par_id3154902" role="paragraph" l10n="U" oldref="176"><ahelp hid="HID_AAI_FUNC_CONVERT">Converts a value from one unit of measure to the corresponding value in another unit of measure.</ahelp> Enter the units of measures directly as text in quotation marks or as a reference. If you enter the units of measure in cells, they must correspond exactly with the following list which is case sensitive: For example, in order to enter a lower case l (for liter) in a cell, enter the apostrophe ' immediately followed by l.</paragraph>
<table id="tbl_id3149771">
<tablerow>
@@ -504,7 +505,7 @@
</tablerow>
</table>
- <paragraph xml-lang="en-US" id="par_id3143277" role="paragraph" l10n="U" oldref="203">Each unit of measure must be preceded by a prefix character from the following list:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143277" role="paragraph" l10n="U" oldref="203">Each unit of measure can be preceded by a prefix character from the following list:</paragraph>
<table id="tbl_id3144759">
<tablerow>
<tablecell>
@@ -529,11 +530,26 @@
<paragraph xml-lang="en-US" id="par_id3151248" role="tablecontent" l10n="U" oldref="208">e, h, k, M, G, T, P, E, Z, Y</paragraph>
</tablecell>
</tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0908200903061174" role="tablecontent" l10n="NEW">Information units "bit" and "byte" may also be prefixed by one of the following IEC 60027-2 / IEEE 1541 prefixes:</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0908200903090966" role="code" l10n="NEW">ki kibi 1024</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0908200903090958" role="code" l10n="NEW">Mi mebi 1048576</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0908200903090936" role="code" l10n="NEW">Gi gibi 1073741824</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0908200903090975" role="code" l10n="NEW">Ti tebi 1099511627776</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0908200903090930" role="code" l10n="NEW">Pi pebi 1125899906842620</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0908200903091070" role="code" l10n="NEW">Ei exbi 1152921504606850000</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0908200903091097" role="code" l10n="NEW">Zi zebi 1180591620717410000000</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0908200903091010" role="code" l10n="NEW">Yi yobi 1208925819614630000000000</paragraph>
+ </tablecell>
+ </tablerow>
</table>
<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
<paragraph xml-lang="en-US" id="hd_id3146125" role="heading" level="3" l10n="U"
oldref="209">Syntax</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153695" role="code" l10n="U" oldref="210">CONVERT(Number; "FromUnit"; "ToUnit")</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153695" role="code" l10n="U" oldref="210">CONVERT_ADD(Number; "FromUnit"; "ToUnit")</paragraph>
<paragraph xml-lang="en-US" id="par_id3147522" role="paragraph" l10n="U" oldref="211">
<emph>Number</emph> is the number to be converted.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154472" role="paragraph" l10n="U" oldref="212">
@@ -543,9 +559,9 @@
<paragraph xml-lang="en-US" id="hd_id3156270" role="heading" level="3" l10n="U"
oldref="214">Examples</paragraph>
<paragraph xml-lang="en-US" id="par_id3156336" role="paragraph" l10n="U" oldref="215">
- <item type="input">=CONVERT(10;"HP";"PS") </item>returns, rounded to two decimal places, 10.14. 10 HP equal 10.14 PS.</paragraph>
+ <item type="input">=CONVERT_ADD(10;"HP";"PS") </item>returns, rounded to two decimal places, 10.14. 10 HP equal 10.14 PS.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154834" role="paragraph" l10n="U" oldref="216">
- <item type="input">=CONVERT(10;"km";"mi") </item>returns, rounded to two decimal places, 6.21. 10 kilometers equal 6.21 miles. The k is the permitted prefix character for the factor 10^3.</paragraph>
+ <item type="input">=CONVERT_ADD(10;"km";"mi") </item>returns, rounded to two decimal places, 6.21. 10 kilometers equal 6.21 miles. The k is the permitted prefix character for the factor 10^3.</paragraph>
</section>
<section id="factdouble">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147096"><bookmark_value>FACTDOUBLE function</bookmark_value>