summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2019-12-06 16:26:43 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2019-12-06 20:30:47 +0100
commiteeb3bd854d8868e7dba8dadd9756e2db4fcce95f (patch)
tree9c72d3c88fdad9955f48cd82e6e05491870e9d2a
parentUpdate list of missing icons for Help (diff)
downloadhelp-eeb3bd854d8868e7dba8dadd9756e2db4fcce95f.tar.gz
help-eeb3bd854d8868e7dba8dadd9756e2db4fcce95f.zip
tdf#129171 Clarify NETWORKDAYS_EXCEL2003
Embed note from Date functions. Change-Id: Iac77cd6610ef6118978fa5ff5495a5e53d94e4d6 Reviewed-on: https://gerrit.libreoffice.org/84668 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--source/text/scalc/01/04060102.xhp18
-rw-r--r--source/text/scalc/01/func_networkdays.xhp4
2 files changed, 11 insertions, 11 deletions
diff --git a/source/text/scalc/01/04060102.xhp b/source/text/scalc/01/04060102.xhp
index ceb61d0484..3f0acce19c 100644
--- a/source/text/scalc/01/04060102.xhp
+++ b/source/text/scalc/01/04060102.xhp
@@ -34,7 +34,7 @@
</bookmark>
-<paragraph id="hd_id3154536" role="heading" level="1" xml-lang="en-US">Date &amp; Time Functions</paragraph>
+<h1 id="hd_id3154536">Date &amp; Time Functions</h1>
<paragraph id="par_id3153973" role="paragraph" xml-lang="en-US"><variable id="datumzeittext">These spreadsheet functions are used for inserting and editing dates and times. </variable></paragraph>
<section id="howtoget">
@@ -42,11 +42,11 @@
</section>
<section id="ADD_note">
-<paragraph id="par_idN10600" role="note" xml-lang="en-US">The functions whose names end with _ADD or _EXCEL2003 return the same results as the corresponding Microsoft Excel 2003 functions without the suffix. Use the functions without suffix to get results based on international standards.</paragraph>
+<note id="par_idN10600">The functions whose names end with _ADD or _EXCEL2003 return the same results as the corresponding Microsoft Excel 2003 functions without the suffix. Use the functions without suffix to get results based on international standards.</note>
</section>
<paragraph id="par_id3150437" role="paragraph" xml-lang="en-US">$[officename] internally handles a date/time value as a numerical value. If you assign the numbering format "Number" to a date or time value, it is converted to a number. For example, 01/01/2000 12:00 PM, converts to 36526.5. The value preceding the decimal point corresponds to the date; the value following the decimal point corresponds to the time. If you do not want to see this type of numerical date or time representation, change the number format (date or time) accordingly. To do this, select the cell containing the date or time value, call its context menu and select <emph>Format Cells</emph>. The <emph>Numbers</emph> tab page contains the functions for defining the number format.</paragraph>
-<paragraph id="hd_id2408825" role="heading" level="2" xml-lang="en-US">Date base for day zero</paragraph>
+<h2 id="hd_id2408825">Date base for day zero</h2>
<paragraph id="par_id9988402" role="paragraph" xml-lang="en-US">Dates are calculated as offsets from a starting day zero. You can set the day zero to be one of the following:</paragraph>
<table id="tbl_id1661427">
@@ -86,21 +86,21 @@
<paragraph id="par_id791039" role="paragraph" xml-lang="en-US">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc - Calculate</emph> to select the date base.</paragraph>
-<paragraph id="par_id1953489" role="warning" xml-lang="en-US">When you copy and paste cells containing date values between different spreadsheets, both spreadsheet documents must be set to the same date base. If date bases differ, the displayed date values will change!</paragraph>
+<warning id="par_id1953489">When you copy and paste cells containing date values between different spreadsheets, both spreadsheet documents must be set to the same date base. If date bases differ, the displayed date values will change!</warning>
-<paragraph id="hd_id757469" role="heading" level="2" xml-lang="en-US">Two digits years</paragraph>
+<h2 id="hd_id757469">Two digits years</h2>
<paragraph id="par_id3149720" role="paragraph" xml-lang="en-US">In <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - General</emph> you find the area <emph>Year (two digits)</emph>. This sets the period for which two-digit information applies. Note that changes made here have an effect on some of the following functions.</paragraph>
<section id="datenumberinfo">
-<paragraph id="par_id3150654" role="note" xml-lang="en-US">When entering dates as part of formulas, slashes or dashes used as date separators are interpreted as arithmetic operators. Therefore, dates entered in this format are not recognized as dates and result in erroneous calculations. To keep dates from being interpreted as parts of formulas use the DATE function, for example, DATE(1954;7;20), or place the date in quotation marks and use the ISO 8601 notation, for example, "1954-07-20". Avoid using locale dependent date formats such as "07/20/54", the calculation may produce errors if the document is loaded under different locale settings.</paragraph>
+<note id="par_id3150654">When entering dates as part of formulas, slashes or dashes used as date separators are interpreted as arithmetic operators. Therefore, dates entered in this format are not recognized as dates and result in erroneous calculations. To keep dates from being interpreted as parts of formulas use the DATE function, for example, DATE(1954;7;20), or place the date in quotation marks and use the ISO 8601 notation, for example, "1954-07-20". Avoid using locale dependent date formats such as "07/20/54", the calculation may produce errors if the document is loaded under different locale settings.</note>
</section>
<section id="datenumberwarn">
- <paragraph xml-lang="en-US" id="par_id571535118151091" role="tip">Unambiguous conversion is possible for ISO 8601 dates and times in their extended formats with separators. If a <emph>#VALUE!</emph> error occurs, then unselect <emph>Generate #VALUE! error</emph> in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline> <emph>- %PRODUCTNAME Calc - Formula</emph>, button <emph>Details...</emph> in section "Detailed Calculation Settings", <emph>Conversion from text to number</emph> list box.</paragraph>
+ <tip id="par_id571535118151091">Unambiguous conversion is possible for ISO 8601 dates and times in their extended formats with separators. If a <emph>#VALUE!</emph> error occurs, then unselect <emph>Generate #VALUE! error</emph> in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline> <emph>- %PRODUCTNAME Calc - Formula</emph>, button <emph>Details...</emph> in section "Detailed Calculation Settings", <emph>Conversion from text to number</emph> list box.</tip>
</section>
<note id="par_id651547654187646">Time zone information is not used in Date and Time functions and cells.</note>
-<paragraph id="par_idN1067A" role="heading" level="2" xml-lang="en-US">Functions</paragraph>
+<h2 id="par_idN1067A">Functions</h2>
<sort order="asc">
<section id="workday">
@@ -172,7 +172,7 @@
</section>
<section id="networkdaysintl">
-<paragraph id="par_id231020162315043955" role="paragraph" localize="false" xml-lang="en-US"> <embedvar href="text/scalc/01/func_networkdays.intl.xhp#networkdaysintl"/> </paragraph>
+<paragraph id="par_id231020162315043955" role="paragraph" localize="false" xml-lang="en-US"> <embedvar href="text/scalc/01/func_networkdays.intl.xhp#networkdaysintl"/> </paragraph>
</section>
<section id="workdaysintl">
diff --git a/source/text/scalc/01/func_networkdays.xhp b/source/text/scalc/01/func_networkdays.xhp
index a1daadfeeb..5eeac272c8 100644
--- a/source/text/scalc/01/func_networkdays.xhp
+++ b/source/text/scalc/01/func_networkdays.xhp
@@ -32,10 +32,10 @@
</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"/>
<h2 id="hd_id3151254"><variable id="networkdays"><link href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link></variable></h2>
<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>
-
+<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<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>