diff options
author | Pierre F <fpy@bger.ch> | 2024-10-29 18:08:22 +0200 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2024-10-30 12:59:01 +0100 |
commit | 8493c54bdde03bdc793b83402b9c341a5a97efac (patch) | |
tree | a16ce2181d97ca4bafcaa2b04cd4f3bcf9125a61 /source/text/scalc | |
parent | f833371fbfb54ba9414f127c96cd2bcb2b985a0c (diff) |
tdf#143846 split DECIMAL() + DOLLAR()
Change-Id: Iba787b44ad846fd2e7ec129fbb72bf916b23e2e9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/175756
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'source/text/scalc')
-rw-r--r-- | source/text/scalc/01/04060110.xhp | 47 | ||||
-rw-r--r-- | source/text/scalc/01/func_decimal.xhp | 44 | ||||
-rw-r--r-- | source/text/scalc/01/func_dollar.xhp | 39 |
3 files changed, 86 insertions, 44 deletions
diff --git a/source/text/scalc/01/04060110.xhp b/source/text/scalc/01/04060110.xhp index 1588ef8454..f80f36f8f2 100644 --- a/source/text/scalc/01/04060110.xhp +++ b/source/text/scalc/01/04060110.xhp @@ -106,50 +106,9 @@ <section id="concatenate"><embed href="text/scalc/01/func_concatenate.xhp#func_concatenate"/></section> -<section id="decimal"> -<bookmark branch="index" id="bm_id3145166"> - <bookmark_value>DECIMAL function</bookmark_value> -</bookmark> - -<bookmark branch="hid/SC_HID_FUNC_DEZIMAL" id="bm_id3150338" localize="false"/> - -<h2 id="hd_id3145166">DECIMAL</h2> -<paragraph id="par_id3156361" role="paragraph"><ahelp hid="HID_FUNC_DEZIMAL">Converts text that represents a number in a <link href="text/shared/00/00000005.xhp#number_system">numeral system</link> with the given base radix to a positive integer.</ahelp> The radix must be in the range 2 to 36. Spaces and tabs are ignored. The <emph>Text</emph> field is not case-sensitive.</paragraph> -<paragraph id="par_id3157994" role="paragraph">If the radix is 16, a leading x or X or 0x or 0X, and an appended h or H, are disregarded. If the radix is 2, an appended b or B is disregarded. Other characters that do not belong to the numeral system generate an error.</paragraph> - -<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> -<paragraph id="par_id3154328" role="code">DECIMAL("Text"; Radix)</paragraph> -<paragraph id="par_id3150128" role="paragraph"> <emph>Text</emph> is the text to be converted.</paragraph> -<paragraph id="par_id3145241" role="paragraph"> <emph>Radix</emph> indicates the base of the numeral system. It may be any positive integer between 2 and 36.</paragraph> - -<embed href="text/scalc/01/common_func.xhp#sectionexample"/> -<paragraph id="par_id3145355" role="paragraph"> <item type="input">=DECIMAL("17";10)</item> returns 17.</paragraph> -<paragraph id="par_id3155622" role="paragraph"> <item type="input">=DECIMAL("FACE";16)</item> returns 64206.</paragraph> -<paragraph id="par_id3151015" role="paragraph"> <item type="input">=DECIMAL("0101";2)</item> returns 5.</paragraph> -<embed href="text/scalc/01/common_func.xhp#sectionseealso"/> -<paragraph role="paragraph" id="par_id421655560837244"><link href="text/scalc/01/04060110.xhp#base">BASE</link></paragraph> -</section> +<section id="decimal"><embed href="text/scalc/01/func_decimal.xhp#func_decimal"/></section> -<section id="dollar"> -<bookmark branch="index" id="bm_id3148402"> - <bookmark_value>DOLLAR function</bookmark_value> -</bookmark> - -<bookmark branch="hid/SC_HID_FUNC_DM" id="bm_id3149532" localize="false"/> - -<h2 id="hd_id3148402">DOLLAR</h2> -<paragraph id="par_id3153049" role="paragraph"><ahelp hid="HID_FUNC_DM">Converts a number to a string representing the amount in the currency format, rounded to a specified decimal places, using the decimal separator that corresponds to the <link href="text/shared/optionen/01140000.xhp">current locale setting</link>.</ahelp> In the <item type="literal">Value</item> field enter the number to be converted. Optionally, you may enter the number of decimal places in the <item type="literal">Decimals</item> field. If no value is specified, all numbers in currency format will be displayed with two decimal places.</paragraph> -<paragraph id="par_id3151280" role="paragraph">You set the currency format in your system settings.</paragraph> - -<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> -<paragraph id="par_id3154188" role="code">DOLLAR(Value [; Decimals])</paragraph> -<paragraph id="par_id3145299" role="paragraph"> <emph>Value</emph> is a number, a reference to a cell containing a number, or a formula which returns a number.</paragraph> -<paragraph id="par_id3145629" role="paragraph"> <emph>Decimals</emph> is the optional number of decimal places.</paragraph> - -<embed href="text/scalc/01/common_func.xhp#sectionexample"/> -<paragraph id="par_id3153546" role="paragraph"> <item type="input">=DOLLAR(255)</item> returns $255.00 for the English (USA) locale and USD (dollar) currency; ¥255.00 for the Japanese locale and JPY (yen) currency; or 255,00 € for the German (Germany) locale and EUR (euro) currency.</paragraph> -<paragraph id="par_id3154635" role="paragraph"> <item type="input">=DOLLAR(367.456;2)</item> returns $367.46.</paragraph> -</section> +<section id="dollar"><embed href="text/scalc/01/func_dollar.xhp#func_dollar"/></section> <section id="exact"> <bookmark branch="index" id="bm_id3150685"> @@ -658,4 +617,4 @@ </section> </body> -</helpdocument>
\ No newline at end of file +</helpdocument> diff --git a/source/text/scalc/01/func_decimal.xhp b/source/text/scalc/01/func_decimal.xhp new file mode 100644 index 0000000000..f136e7c968 --- /dev/null +++ b/source/text/scalc/01/func_decimal.xhp @@ -0,0 +1,44 @@ +<?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="calcfunc_decimal" indexer="include" status="PUBLISH"> + <title id="tit">DECIMAL Function</title> + <filename>/text/scalc/01/func_decimal.xhp</filename> + </topic> + </meta> + <body> + <bookmark branch="index" id="bm_id3145166"> + <bookmark_value>DECIMAL function</bookmark_value> +</bookmark> + <bookmark branch="hid/SC_HID_FUNC_DEZIMAL" id="bm_id3150338" localize="false"/> + <section id="func_decimal"> + <h1 id="hd_id3145166"> + <variable id="decimal_h1"> + <link href="text/scalc/01/func_decimal.xhp">DECIMAL</link> + </variable> + </h1> + <paragraph id="par_id3156361" role="paragraph"><ahelp hid="HID_FUNC_DEZIMAL">Converts text that represents a number in a <link href="text/shared/00/00000005.xhp#number_system">numeral system</link> with the given base radix to a positive integer.</ahelp> The radix must be in the range 2 to 36. Spaces and tabs are ignored. The <emph>Text</emph> field is not case-sensitive.</paragraph> + </section> + <paragraph id="par_id3157994" role="paragraph">If the radix is 16, a leading x or X or 0x or 0X, and an appended h or H, are disregarded. If the radix is 2, an appended b or B is disregarded. Other characters that do not belong to the numeral system generate an error.</paragraph> + <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> + <paragraph id="par_id3154328" role="code">DECIMAL("Text"; Radix)</paragraph> + <paragraph id="par_id3150128" role="paragraph"> <emph>Text</emph> is the text to be converted.</paragraph> + <paragraph id="par_id3145241" role="paragraph"> <emph>Radix</emph> indicates the base of the numeral system. It may be any positive integer between 2 and 36.</paragraph> + <embed href="text/scalc/01/common_func.xhp#sectionexample"/> + <paragraph id="par_id3145355" role="paragraph"> <item type="input">=DECIMAL("17";10)</item> returns 17.</paragraph> + <paragraph id="par_id3155622" role="paragraph"> <item type="input">=DECIMAL("FACE";16)</item> returns 64206.</paragraph> + <paragraph id="par_id3151015" role="paragraph"> <item type="input">=DECIMAL("0101";2)</item> returns 5.</paragraph> + <embed href="text/scalc/01/common_func.xhp#sectionseealso"/> + <paragraph role="paragraph" id="par_id421655560837244"> + <link href="text/scalc/01/04060110.xhp#base">BASE</link> + </paragraph> + </body> +</helpdocument> diff --git a/source/text/scalc/01/func_dollar.xhp b/source/text/scalc/01/func_dollar.xhp new file mode 100644 index 0000000000..fd5aabb598 --- /dev/null +++ b/source/text/scalc/01/func_dollar.xhp @@ -0,0 +1,39 @@ +<?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="calcfunc_dollar" indexer="include" status="PUBLISH"> + <title id="tit">DOLLAR Function</title> + <filename>/text/scalc/01/func_dollar.xhp</filename> + </topic> + </meta> + <body> + <bookmark branch="index" id="bm_id3148402"> + <bookmark_value>DOLLAR function</bookmark_value> +</bookmark> + <bookmark branch="hid/SC_HID_FUNC_DM" id="bm_id3149532" localize="false"/> + <section id="func_dollar"> + <h1 id="hd_id3148402"> + <variable id="dollar_h1"> + <link href="text/scalc/01/func_dollar.xhp">DOLLAR</link> + </variable> + </h1> + <paragraph id="par_id3153049" role="paragraph"><ahelp hid="HID_FUNC_DM">Converts a number to a string representing the amount in the currency format, rounded to a specified decimal places, using the decimal separator that corresponds to the <link href="text/shared/optionen/01140000.xhp">current locale setting</link>.</ahelp> In the <item type="literal">Value</item> field enter the number to be converted. Optionally, you may enter the number of decimal places in the <item type="literal">Decimals</item> field. If no value is specified, all numbers in currency format will be displayed with two decimal places.</paragraph> + </section> + <paragraph id="par_id3151280" role="paragraph">You set the currency format in your system settings.</paragraph> + <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> + <paragraph id="par_id3154188" role="code">DOLLAR(Value [; Decimals])</paragraph> + <paragraph id="par_id3145299" role="paragraph"> <emph>Value</emph> is a number, a reference to a cell containing a number, or a formula which returns a number.</paragraph> + <paragraph id="par_id3145629" role="paragraph"> <emph>Decimals</emph> is the optional number of decimal places.</paragraph> + <embed href="text/scalc/01/common_func.xhp#sectionexample"/> + <paragraph id="par_id3153546" role="paragraph"> <item type="input">=DOLLAR(255)</item> returns $255.00 for the English (USA) locale and USD (dollar) currency; ¥255.00 for the Japanese locale and JPY (yen) currency; or 255,00 € for the German (Germany) locale and EUR (euro) currency.</paragraph> + <paragraph id="par_id3154635" role="paragraph"> <item type="input">=DOLLAR(367.456;2)</item> returns $367.46.</paragraph> + </body> +</helpdocument> |