source/text/scalc/01/04060106.xhp | 12 ++++++------ source/text/scalc/01/04060116.xhp | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit 5c2654302e9e4dcf45f802e8d31e53f55251c367 Author: Eike Rathke <er...@redhat.com> Date: Fri Sep 1 12:34:44 2017 +0200 Rename Help CONVERT to CONVERT_OOO, CONVERT_ADD to CONVERT, tdf#69539 UI function name wise this was already done for 5.3, see https://bugs.documentfoundation.org/show_bug.cgi?id=69539 So CONVERT actually matches the ODF definition and Excel and what the user expects. Change-Id: Ifdcbedc324dc5b4c8e43f2428a5c02dbe97d48c0 diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp index f89d93a11..7d49a2905 100644 --- a/source/text/scalc/01/04060106.xhp +++ b/source/text/scalc/01/04060106.xhp @@ -1431,21 +1431,21 @@ <section id="convert"> <bookmark xml-lang="en-US" branch="index" id="bm_id0908200902090676"> - <bookmark_value>CONVERT function</bookmark_value> + <bookmark_value>CONVERT_OOO function</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_UMRECHNEN" id="bm_id0908200902093111" localize="false"/> -<paragraph id="hd_id0908200902074836" role="heading" level="2" xml-lang="en-US">CONVERT</paragraph> +<paragraph id="hd_id0908200902074836" role="heading" level="2" xml-lang="en-US">CONVERT_OOO</paragraph> <paragraph id="par_id0908200902131122" role="paragraph" xml-lang="en-US"><ahelp hid=".">Converts a value from one unit of measurement to another unit of measurement. The conversion factors are given in a list in the configuration.</ahelp></paragraph> <paragraph id="par_id0908200902475420" role="paragraph" xml-lang="en-US">At one time the list of conversion factors included the legacy European currencies and the Euro (see examples below). We suggest using the new function EUROCONVERT for converting these currencies.</paragraph> <paragraph id="hd_id0908200902131071" role="heading" level="3" xml-lang="en-US">Syntax</paragraph> -<paragraph id="par_id0908200902131191" role="code" xml-lang="en-US">CONVERT(value;"text";"text")</paragraph> +<paragraph id="par_id0908200902131191" role="code" xml-lang="en-US">CONVERT_OOO(value;"text";"text")</paragraph> <paragraph id="hd_id0908200902131152" role="heading" level="3" xml-lang="en-US">Example</paragraph> -<paragraph id="par_id090820090213112" role="paragraph" xml-lang="en-US"><item type="input">=CONVERT(100;"ATS";"EUR")</item> returns the Euro value of 100 Austrian Schillings.</paragraph> -<paragraph id="par_id0908200902475431" role="paragraph" xml-lang="en-US">=CONVERT(100;"EUR";"DEM") converts 100 Euros into German Marks.</paragraph> +<paragraph id="par_id090820090213112" role="paragraph" xml-lang="en-US"><item type="input">=CONVERT_OOO(100;"ATS";"EUR")</item> returns the Euro value of 100 Austrian Schillings.</paragraph> +<paragraph id="par_id0908200902475431" role="paragraph" xml-lang="en-US">=CONVERT_OOO(100;"EUR";"DEM") converts 100 Euros into German Marks.</paragraph> </section> <section id="Section10"> @@ -1644,4 +1644,4 @@ </section> </body> -</helpdocument> \ No newline at end of file +</helpdocument> diff --git a/source/text/scalc/01/04060116.xhp b/source/text/scalc/01/04060116.xhp index ed09c359b..d88285acc 100644 --- a/source/text/scalc/01/04060116.xhp +++ b/source/text/scalc/01/04060116.xhp @@ -383,10 +383,10 @@ <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_ADD function</bookmark_value> +<bookmark xml-lang="en-US" branch="index" id="bm_id3148446"><bookmark_value>CONVERT function</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_CONVERT" id="bm_id3150773" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3148446" role="heading" level="2">CONVERT_ADD</paragraph> +<paragraph xml-lang="en-US" id="hd_id3148446" role="heading" level="2">CONVERT</paragraph> <paragraph xml-lang="en-US" id="par_id3154902" role="paragraph"><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> @@ -691,7 +691,7 @@ </table> <embed href="text/scalc/01/04060102.xhp#ADD_note"/> <paragraph xml-lang="en-US" id="hd_id3146125" role="heading" level="3">Syntax</paragraph> - <paragraph xml-lang="en-US" id="par_id3153695" role="code">CONVERT_ADD(Number; "FromUnit"; "ToUnit")</paragraph> + <paragraph xml-lang="en-US" id="par_id3153695" role="code">CONVERT(Number; "FromUnit"; "ToUnit")</paragraph> <paragraph xml-lang="en-US" id="par_id3147522" role="paragraph"> <emph>Number</emph> is the number to be converted.</paragraph> <paragraph xml-lang="en-US" id="par_id3154472" role="paragraph"> @@ -700,9 +700,9 @@ <emph>ToUnit</emph> is the unit to which conversion is taking place. Both units must be of the same type.</paragraph> <paragraph xml-lang="en-US" id="hd_id3156270" role="heading" level="3">Examples</paragraph> <paragraph xml-lang="en-US" id="par_id3156336" role="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> + <item type="input">=CONVERT(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"> - <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> + <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> </section> <section id="factdouble"> <bookmark xml-lang="en-US" branch="index" id="bm_id3147096"><bookmark_value>FACTDOUBLE function</bookmark_value> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits