source/text/scalc/01/04060106.xhp | 3 - source/text/scalc/01/func_ceiling.xhp | 58 ++++++++++++------------- source/text/scalc/01/func_networkdays.intl.xhp | 28 ++++++------ source/text/scalc/01/func_networkdays.xhp | 27 +++++------ 4 files changed, 57 insertions(+), 59 deletions(-)
New commits: commit ce3c29b0ba0db095049bb4792db3b0df10ad0a94 Author: Olivier Hallot <olivier.hal...@libreoffice.org> AuthorDate: Sat Sep 7 08:44:21 2024 -0300 Commit: Olivier Hallot <olivier.hal...@libreoffice.org> CommitDate: Sat Sep 7 18:59:38 2024 +0200 tdf#162607 Remove dup's in hid2file.js, SC_HID* + fixed bad bookmarks + refactor Change-Id: Ie466ecff62f4bdcbecfe737a80c5ff2a93e02d9d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172992 Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org> Tested-by: Jenkins diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp index 013826ae9b..78751f8bac 100644 --- a/source/text/scalc/01/04060106.xhp +++ b/source/text/scalc/01/04060106.xhp @@ -1297,11 +1297,10 @@ <bookmark_value>EUROCONVERT function</bookmark_value> </bookmark> -<bookmark branch="hid/SC_HID_FUNC_UMRECHNEN" id="bm_id3143684" localize="false"/> <bookmark branch="hid/SC_HID_FUNC_EUROCONVERT" id="bm_id0119200904282677" localize="false"/> <h2 id="hd_id3143672">EUROCONVERT<comment>insert link in financial</comment></h2> -<paragraph id="par_id3143708" role="paragraph"><ahelp hid="HID_FUNC_UMRECHNEN">Converts between old European national currency and to and from Euros.</ahelp></paragraph> +<paragraph id="par_id3143708" role="paragraph"><ahelp hid="HID_FUNC_EUROCONVERT">Converts between old European national currency and to and from Euros.</ahelp></paragraph> <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> <paragraph id="par_id3143748" role="code">EUROCONVERT(Value; "From_currency"; "To_currency" [; full_precision [; triangulation_precision]])</paragraph> diff --git a/source/text/scalc/01/func_ceiling.xhp b/source/text/scalc/01/func_ceiling.xhp index b52b1a453e..548c6d745f 100644 --- a/source/text/scalc/01/func_ceiling.xhp +++ b/source/text/scalc/01/func_ceiling.xhp @@ -10,30 +10,30 @@ --> <meta> <topic id="scalcceilingfunction" indexer="include" status="PUBLISH"> - <title id="tit" xml-lang="en-US">Ceiling functions</title> + <title id="tit">Ceiling functions</title> <filename>/text/scalc/01/func_ceiling.xhp</filename> </topic> </meta> <body> <h1 id="hd_id971586216771519">Ceiling functions</h1> <section id="ceiling"> -<bookmark xml-lang="en-US" branch="index" id="bm_id3152518"> +<bookmark branch="index" id="bm_id3152518"> <bookmark_value>CEILING function</bookmark_value> <bookmark_value>rounding;up to multiples of significance</bookmark_value> </bookmark> <comment>mw added one entry</comment> - <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_OBERGRENZE" id="bm_id3152530" localize="false"/> + <bookmark 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">CEILING</link></variable></h2> - <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 id="par_id3153422" role="paragraph"><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 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/ful_func.xhp#func_head_syntax"/> - <paragraph id="par_id3153454" role="code" xml-lang="en-US">CEILING(Number [; Significance [; Mode]])</paragraph> + <paragraph id="par_id3153454" role="code">CEILING(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> + <paragraph id="par_id3153467" role="paragraph"><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_id3155000" 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_id3155020" 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 down (away from zero); if <emph>Mode</emph> is equal to zero or not given, negative numbers are rounded up (towards zero).</paragraph> + <paragraph id="par_id3155000" role="paragraph"><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_id3155020" role="paragraph"><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 down (away from zero); if <emph>Mode</emph> is equal to zero or not given, negative numbers are rounded up (towards zero).</paragraph> <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> <paragraph role="paragraph" id="par_id281586208138400"><input>=CEILING(3.45)</input> returns 4.</paragraph> <paragraph role="paragraph" id="par_id921586208142416"><input>=CEILING(3.45; 3)</input> returns 6.</paragraph> @@ -44,20 +44,20 @@ </section> <section id="ceilingprecise"> -<bookmark xml-lang="en-US" branch="index" id="bm_id2952518"> +<bookmark branch="index" id="bm_id2952518"> <bookmark_value>CEILING.PRECISE function</bookmark_value> <bookmark_value>rounding;up to multiples of significance</bookmark_value> </bookmark> <comment>mw added one entry</comment> - <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_CEIL_MS" id="bm_id2952530" localize="false"/> + <bookmark branch="hid/SC_HID_FUNC_CEIL_PRECISE" id="bm_id2952530" localize="false"/> <h2 id="hd_id2952518"><variable id="CEILING.PRECISEh1"><link href="text/scalc/01/func_ceiling.xhp#ceilingprecise">CEILING.PRECISE</link></variable></h2> - <paragraph id="par_id2953422" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_CEIL_MS">Rounds a number up to the nearest multiple of a significance value.</ahelp></paragraph> + <paragraph id="par_id2953422" role="paragraph"><ahelp hid="HID_FUNC_CEIL_MS">Rounds a number up to the nearest multiple of a significance value.</ahelp></paragraph> <paragraph role="paragraph" id="par_id151586642494759">For a positive number the function rounds up (away from zero). For a negative number, the function rounds up (towards zero). The sign of the significance value is ignored.</paragraph> <note id="par_id631586642933797">This function calculates identical results to the <link href="text/scalc/01/func_ceiling.xhp#isoceiling">ISO.CEILING</link> function.</note> <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> - <paragraph id="par_id2953454" role="code" xml-lang="en-US">CEILING.PRECISE(Number [; Significance])</paragraph> + <paragraph id="par_id2953454" role="code">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> + <paragraph id="par_id2955000" role="paragraph"><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/ful_func.xhp#func_head_example"/> <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> @@ -69,19 +69,19 @@ </section> <section id="ceilingmath"> -<bookmark xml-lang="en-US" branch="index" id="bm_id911516997198644"> +<bookmark branch="index" id="bm_id911516997198644"> <bookmark_value>CEILING.MATH function</bookmark_value> </bookmark> - <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_CEIL_MATH" id="bm_id511516997249645" localize="false"/> + <bookmark branch="hid/SC_HID_FUNC_CEIL_MATH" id="bm_id511516997249645" localize="false"/> <h2 id="hd_id91516997330445"><variable id="CEILING.MATHh1"><link href="text/scalc/01/func_ceiling.xhp#ceilingmath">CEILING.MATH</link></variable></h2> - <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_id81516997342088"><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> <warning id="par_id291516998575663">This function exists for interoperability with Microsoft Excel 2013 or newer.</warning> <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> - <paragraph role="code" id="par_id841516997669932" xml-lang="en-US">CEILING.MATH(Number [; Significance [; Mode]])</paragraph> + <paragraph role="code" id="par_id841516997669932">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> + <paragraph role="paragraph" id="par_id491516997725772"><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"><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> <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> <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> @@ -94,18 +94,18 @@ <paragraph role="paragraph" id="par_id341646873986703" localize="false"><literal>COM.MICROSOFT.CEILING.MATH</literal></paragraph> </section> <section id="ceilingxcl"> -<bookmark xml-lang="en-US" branch="index" id="bm_id921516998608939"> +<bookmark branch="index" id="bm_id921516998608939"> <bookmark_value>CEILING.XCL function</bookmark_value> </bookmark> - <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_CEIL_MS" id="bm_id221516998652517" localize="false"/> + <bookmark branch="hid/SC_HID_FUNC_CEIL_MS" id="bm_id221516998652517" localize="false"/> <h2 id="hd_id411516998838823"><variable id="CEILING.XCLh1"><link href="text/scalc/01/func_ceiling.xhp#ceilingxcl">CEILING.XCL</link></variable></h2> - <paragraph role="paragraph" id="par_id811516998845826" xml-lang="en-US"><ahelp hid="HID_FUNC_CEIL_MS">Rounds a number to the nearest multiple of a significance value.</ahelp></paragraph> + <paragraph role="paragraph" id="par_id811516998845826"><ahelp hid="HID_FUNC_CEIL_MS">Rounds a number to the nearest multiple of a significance value.</ahelp></paragraph> <paragraph role="paragraph" id="par_id361586213828675">For a positive number and a positive significance value, the function rounds up (away from zero). For a negative number and a positive significance value, the function rounds up (towards zero). For a negative number and a negative significance value, the function rounds down (away from zero). The function returns an error if the number is positive and the significance value is negative.</paragraph> <warning id="par_id881586213934118">This function exists for interoperability with Microsoft Excel 2007 or older. If a Calc spreadsheet is exported to Microsoft Excel, references to Calc’s CEILING.XCL function are exported as references to Excel’s CEILING function, which is compatible with all Excel versions. If a Microsoft Excel spreadsheet is imported into Calc, references to Excel’s CEILING function are imported as references to Calc’s CEILING.XCL function.</warning> <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> - <paragraph role="code" id="par_id251516998856873" xml-lang="en-US">CEILING.XCL(Number; Significance)</paragraph> + <paragraph role="code" id="par_id251516998856873">CEILING.XCL(Number; Significance)</paragraph> <embed href="text/scalc/01/func_ceiling.xhp#argnumber"/> - <paragraph role="paragraph" id="par_id151516998882622" xml-lang="en-US"><emph>Significance</emph> is the value, or a reference to a cell containing the value, to whose multiple <emph>Number</emph> is to be rounded.</paragraph> + <paragraph role="paragraph" id="par_id151516998882622"><emph>Significance</emph> is the value, or a reference to a cell containing the value, to whose multiple <emph>Number</emph> is to be rounded.</paragraph> <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> <paragraph role="paragraph" id="par_id421586214128242"><input>=CEILING.XCL(3.45,2)</input> returns 4.</paragraph> <paragraph role="paragraph" id="par_id651586214132234"><input>=CEILING.XCL(-45.67; 2)</input> returns -44.</paragraph> @@ -116,21 +116,21 @@ <paragraph role="paragraph" id="par_id341640873786703" localize="false"><literal>COM.MICROSOFT.CEILING</literal></paragraph> </section> <section id="isoceiling"> -<bookmark xml-lang="en-US" branch="index" id="bm_id8952518"> +<bookmark branch="index" id="bm_id8952518"> <bookmark_value>ISO.CEILING function</bookmark_value> <bookmark_value>rounding;up to multiples of significance</bookmark_value> </bookmark> <comment>mw added one entry</comment> - <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_CEIL_ISO" id="bm_id8952530" localize="false"/> + <bookmark branch="hid/SC_HID_FUNC_CEIL_ISO" id="bm_id8952530" localize="false"/> <h2 id="hd_id8952518"><variable id="ISO.CEILINGh1"><link href="text/scalc/01/func_ceiling.xhp#isoceiling">ISO.CEILING</link></variable></h2> - <paragraph id="par_id8953422" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_CEIL_ISO">Rounds a number up to the nearest multiple of a significance value.</ahelp></paragraph> + <paragraph id="par_id8953422" role="paragraph"><ahelp hid="HID_FUNC_CEIL_ISO">Rounds a number up to the nearest multiple of a significance value.</ahelp></paragraph> <paragraph role="paragraph" id="par_id101586214229587">For a positive number the function rounds up (away from zero). For a negative number, the function rounds up (towards zero). The sign of the significance value is ignored.</paragraph> <note id="par_id821586214265060">This function calculates identical results to the <link href="text/scalc/01/func_ceiling.xhp#ceilingprecise">CEILING.PRECISE</link> function.</note> <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> - <paragraph id="par_id8953454" role="code" xml-lang="en-US">ISO.CEILING(Number [; Significance])</paragraph> + <paragraph id="par_id8953454" role="code">ISO.CEILING(Number [; Significance])</paragraph> <embed href="text/scalc/01/func_ceiling.xhp#argnumber"/> - <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> + <paragraph id="par_id8955000" role="paragraph"><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/ful_func.xhp#func_head_example"/> <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> diff --git a/source/text/scalc/01/func_networkdays.intl.xhp b/source/text/scalc/01/func_networkdays.intl.xhp index 4aa453400d..cfd87b74a5 100644 --- a/source/text/scalc/01/func_networkdays.intl.xhp +++ b/source/text/scalc/01/func_networkdays.intl.xhp @@ -20,36 +20,36 @@ <meta> <topic id="textscalc01func_networkdaysintlxml" indexer="include" status="PUBLISH"> - <title id="tit" xml-lang="en-US">NETWORKDAYS.INTL</title> + <title id="tit">NETWORKDAYS.INTL</title> <filename>/text/scalc/01/func_networkdays.intl.xhp</filename> </topic> </meta> <body> <section id="networkdaysintl_function"> -<bookmark xml-lang="en-US" branch="index" id="bm_id231020162321219565"> +<bookmark branch="index" id="bm_id231020162321219565"> <bookmark_value>NETWORKDAYS.INTL function</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_NETWORKDAYS_MS" id="bm_id231020162214032558" localize="false"/> +<bookmark branch="hid/SC_HID_FUNC_NETWORKDAYS_MS" id="bm_id231020162214032558" localize="false"/> <h1 id="hd_id231020162211573602"><variable id="networkdaysintl"><link href="text/scalc/01/func_networkdays.intl.xhp">NETWORKDAYS.INTL</link></variable></h1> -<paragraph id="par_id231020162213393086" role="paragraph" xml-lang="en-US"><ahelp hid=".">Returns the number of workdays between a start date and an end date. There are options to define weekend days and holidays. The optional weekend parameter (or a string) can be used to define the weekend days (or the non-working days in each week). Also, optionally, the user can define a holiday list. The weekend days and user-defined holidays are not counted as working days.</ahelp></paragraph> +<paragraph id="par_id231020162213393086" role="paragraph"><ahelp hid=".">Returns the number of workdays between a start date and an end date. There are options to define weekend days and holidays. The optional weekend parameter (or a string) can be used to define the weekend days (or the non-working days in each week). Also, optionally, the user can define a holiday list. The weekend days and user-defined holidays are not counted as working days.</ahelp></paragraph> </section> <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> -<paragraph id="par_id231020162249539143" role="code" xml-lang="en-US">NETWORKDAYS.INTL(StartDate; EndDate [; [ Weekend ] [; Holidays ] ])</paragraph> -<paragraph id="par_id231020162249533010" role="paragraph" xml-lang="en-US"><emph>StartDate</emph> is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation.</paragraph> -<paragraph id="par_id231020162249536398" role="paragraph" xml-lang="en-US"><emph>EndDate</emph> is the date up until when the calculation is carried out. If the end date is a workday, the day is included in the calculation.</paragraph> +<paragraph id="par_id231020162249539143" role="code">NETWORKDAYS.INTL(StartDate; EndDate [; [ Weekend ] [; Holidays ] ])</paragraph> +<paragraph id="par_id231020162249533010" role="paragraph"><emph>StartDate</emph> is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation.</paragraph> +<paragraph id="par_id231020162249536398" role="paragraph"><emph>EndDate</emph> is the date up until when the calculation is carried out. If the end date is a workday, the day is included in the calculation.</paragraph> <embed href="text/scalc/01/common_func_workdaysintl.xhp#embed_workdays_intl"/> <embed href="text/scalc/01/04060102.xhp#datenumberinfo"/> <embed href="text/scalc/01/04060102.xhp#datenumberwarn"/> <embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/> <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> -<paragraph id="par_id231020162249554032" role="paragraph" xml-lang="en-US">How many workdays fall between December 15, 2016 and January 14, 2017? Let the start date be located in C3 and the end date in D3. Cells F3 to J3 contain five (5) holidays for Christmas and New Year in date format: December 24, 2016; December 25, 2016; December 26, 2016; December 31, 2016; and January 1, 2017.</paragraph> -<paragraph id="par_id231020162249551234" role="paragraph" xml-lang="en-US"><item type="input">=NETWORKDAYS.INTL(C3;D3;;F3:J3)</item> returns 21 workdays with default for weekend days.</paragraph> -<paragraph id="par_id231020162249553109" role="paragraph" xml-lang="en-US"><item type="input">=NETWORKDAYS.INTL(C3;D3;11;F3:J3)</item> returns 24 workdays with Sunday only weekends.</paragraph> -<paragraph id="par_id231020162249557786" role="paragraph" xml-lang="en-US">Alternatively, use the weekend string “0000001” to define Sunday as the non-working day of every week.</paragraph> -<paragraph id="par_id231020162249553409" role="paragraph" xml-lang="en-US"><item type="input">=NETWORKDAYS.INTL(C3;D3;“0000001”;F3:J3)</item> returns 24 workdays with Sunday only weekend.</paragraph> -<paragraph id="par_id231020162249556946" role="paragraph" xml-lang="en-US">The function can be used without the two optional parameters – weekday and holidays – by leaving them out:</paragraph> -<paragraph id="par_id23102016224955931" role="paragraph" xml-lang="en-US"><item type="input">=NETWORKDAYS.INTL(C3;D3)</item> gives 22 working days.</paragraph> +<paragraph id="par_id231020162249554032" role="paragraph">How many workdays fall between December 15, 2016 and January 14, 2017? Let the start date be located in C3 and the end date in D3. Cells F3 to J3 contain five (5) holidays for Christmas and New Year in date format: December 24, 2016; December 25, 2016; December 26, 2016; December 31, 2016; and January 1, 2017.</paragraph> +<paragraph id="par_id231020162249551234" role="paragraph"><item type="input">=NETWORKDAYS.INTL(C3;D3;;F3:J3)</item> returns 21 workdays with default for weekend days.</paragraph> +<paragraph id="par_id231020162249553109" role="paragraph"><item type="input">=NETWORKDAYS.INTL(C3;D3;11;F3:J3)</item> returns 24 workdays with Sunday only weekends.</paragraph> +<paragraph id="par_id231020162249557786" role="paragraph">Alternatively, use the weekend string “0000001” to define Sunday as the non-working day of every week.</paragraph> +<paragraph id="par_id231020162249553409" role="paragraph"><item type="input">=NETWORKDAYS.INTL(C3;D3;“0000001”;F3:J3)</item> returns 24 workdays with Sunday only weekend.</paragraph> +<paragraph id="par_id231020162249556946" role="paragraph">The function can be used without the two optional parameters – weekday and holidays – by leaving them out:</paragraph> +<paragraph id="par_id23102016224955931" role="paragraph"><item type="input">=NETWORKDAYS.INTL(C3;D3)</item> gives 22 working days.</paragraph> <embed href="text/scalc/01/common_func.xhp#sectiontechinfo"/> <embed href="text/scalc/00/avail_release.xhp#4.3"/> <embed href="text/scalc/01/common_func.xhp#notODFF"/> diff --git a/source/text/scalc/01/func_networkdays.xhp b/source/text/scalc/01/func_networkdays.xhp index aeb0a05018..1636ec6623 100644 --- a/source/text/scalc/01/func_networkdays.xhp +++ b/source/text/scalc/01/func_networkdays.xhp @@ -20,38 +20,37 @@ <meta> <topic id="textscalc01func_networkdaysxml" indexer="include" status="PUBLISH"> - <title id="tit" xml-lang="en-US">NETWORKDAYS</title> + <title id="tit">NETWORKDAYS</title> <filename>/text/scalc/01/func_networkdays.xhp</filename> </topic> </meta> <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3151254"> +<bookmark branch="index" id="bm_id3151254"> <bookmark_value>NETWORKDAYS function</bookmark_value> <bookmark_value>NETWORKDAYS_EXCEL2003 function</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_NETWORKDAYS" id="bm_id3153696" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_NETWORKDAYS_MS" id="bm_id3152396" localize="false"/> +<bookmark branch="hid/SC_HID_AAI_FUNC_NETWORKDAYS" id="bm_id3153696" localize="false"/> <h1 id="hd_id3151254"><variable id="networkdays"><link href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link></variable></h1> -<paragraph id="par_id3153788" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_NETWORKDAYS">Returns the number of workdays between a <emph>start date</emph> and an <emph>end date</emph>. Holidays can be deducted.</ahelp></paragraph> +<paragraph id="par_id3153788" role="paragraph"><ahelp hid="HID_AAI_FUNC_NETWORKDAYS">Returns the number of workdays between a <emph>start date</emph> and an <emph>end date</emph>. Holidays can be deducted.</ahelp></paragraph> <embed href="text/scalc/01/04060102.xhp#ADD_note"/> <embed href="text/scalc/01/ODFF.xhp#odff"/> <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> -<paragraph id="par_id3145775" role="code" xml-lang="en-US">NETWORKDAYS(StartDate; EndDate [; [ Holidays ] [; Workdays ] ])</paragraph> -<paragraph id="par_id3153885" role="paragraph" xml-lang="en-US"><emph>StartDate</emph> is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation.</paragraph> -<paragraph id="par_id3151110" role="paragraph" xml-lang="en-US"><emph>EndDate</emph> is the date up until when the calculation is carried out. If the end date is a workday, the day is included in the calculation.</paragraph> -<paragraph id="par_id3154115" role="paragraph" xml-lang="en-US"><emph>Holidays</emph> is an optional list of holidays. These are non-working days. Enter a cell range in which the holidays are listed individually.</paragraph> -<paragraph id="par_id160920161749585013" role="paragraph" xml-lang="en-US"><emph>Workdays</emph> is an optional list of number values defining standard work week. This list starts by Sunday, workdays are indicated by zero and non-working days by non-zero value.</paragraph> +<paragraph id="par_id3145775" role="code">NETWORKDAYS(StartDate; EndDate [; [ Holidays ] [; Workdays ] ])</paragraph> +<paragraph id="par_id3153885" role="paragraph"><emph>StartDate</emph> is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation.</paragraph> +<paragraph id="par_id3151110" role="paragraph"><emph>EndDate</emph> is the date up until when the calculation is carried out. If the end date is a workday, the day is included in the calculation.</paragraph> +<paragraph id="par_id3154115" role="paragraph"><emph>Holidays</emph> is an optional list of holidays. These are non-working days. Enter a cell range in which the holidays are listed individually.</paragraph> +<paragraph id="par_id160920161749585013" role="paragraph"><emph>Workdays</emph> is an optional list of number values defining standard work week. This list starts by Sunday, workdays are indicated by zero and non-working days by non-zero value.</paragraph> <embed href="text/scalc/01/04060102.xhp#datenumberinfo"/> <embed href="text/scalc/01/04060102.xhp#datenumberwarn"/> <embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/> <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> -<paragraph id="par_id3154661" role="paragraph" xml-lang="en-US">How many workdays fall between 2001-12-15 and 2002-01-15? The start date is located in C3 and the end date in D3. Cells F3 to J3 contain the following Christmas and New Year holidays: "2001-12-24", "2001-12-25", "2001-12-26", "2001-12-31", "2002-01-01".</paragraph> -<paragraph id="par_id3147328" role="paragraph" xml-lang="en-US"><item type="input">=NETWORKDAYS(C3;D3;F3:J3)</item> returns 17 workdays.</paragraph> -<paragraph id="par_id160920161751233621" role="paragraph" xml-lang="en-US">How many workdays fall between September 12nd and 25th in 2016 if only Mondays, Tuesdays and Wednesdays are considered as workdays?</paragraph> -<paragraph id="par_id160920161751235483" role="paragraph" xml-lang="en-US"><item type="input">=NETWORKDAYS(DATE(2016;9;12); DATE(2016;9;25); ; {1;0;0;0;1;1;1})</item> returns 6 workdays.</paragraph> +<paragraph id="par_id3154661" role="paragraph">How many workdays fall between 2001-12-15 and 2002-01-15? The start date is located in C3 and the end date in D3. Cells F3 to J3 contain the following Christmas and New Year holidays: "2001-12-24", "2001-12-25", "2001-12-26", "2001-12-31", "2002-01-01".</paragraph> +<paragraph id="par_id3147328" role="paragraph"><item type="input">=NETWORKDAYS(C3;D3;F3:J3)</item> returns 17 workdays.</paragraph> +<paragraph id="par_id160920161751233621" role="paragraph">How many workdays fall between September 12nd and 25th in 2016 if only Mondays, Tuesdays and Wednesdays are considered as workdays?</paragraph> +<paragraph id="par_id160920161751235483" role="paragraph"><item type="input">=NETWORKDAYS(DATE(2016;9;12); DATE(2016;9;25); ; {1;0;0;0;1;1;1})</item> returns 6 workdays.</paragraph> <section id="relatedtopics"> <tip id="par_id151677015372427"><link href="https://wiki.documentfoundation.org/Documentation/Calc_Functions/NETWORKDAYS">NETWORKDAYS wiki page</link>.</tip> <embed href="text/scalc/01/04060102.xhp#datetimefunctions"/>