diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 15:20:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 15:20:14 +0000 |
| commit | c4e409fbef93c8c587b73051b8d539ab31465aa9 (patch) | |
| tree | 51d0826cfeccd213de12bf86d208c3a46e9a4a19 | |
| parent | 5c875f2b5a10e630b93ff74c8d815378433464de (diff) | |
INTEGRATION: CWS helpcontentbeta (1.1.2); FILE MERGED
2004/09/16 11:46:20 fpe 1.1.2.1: Regular Update
| -rw-r--r-- | helpcontent2/source/text/scalc/01/func_workday.xhp | 64 | ||||
| -rw-r--r-- | helpcontent2/source/text/scalc/01/func_year.xhp | 56 | ||||
| -rw-r--r-- | helpcontent2/source/text/scalc/01/func_yearfrac.xhp | 166 |
3 files changed, 143 insertions, 143 deletions
diff --git a/helpcontent2/source/text/scalc/01/func_workday.xhp b/helpcontent2/source/text/scalc/01/func_workday.xhp index f4fc3bf272..05390a3ac6 100644 --- a/helpcontent2/source/text/scalc/01/func_workday.xhp +++ b/helpcontent2/source/text/scalc/01/func_workday.xhp @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> <!--*********************************************************************** * * The Contents of this file are made available subject to the terms of @@ -52,37 +52,37 @@ * Contributor(s): _______________________________________ * * - ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textscalc01func_workdayxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">WORKDAY</title>
-<filename>text/scalc/01/func_workday.xhp</filename>
-</topic>
-<history>
-<created date="2004-05-19T17:10:11">Extracted from 04060102</created>
-<lastedited date="2004-06-28T11:23:39"/>
-</history>
-</meta>
+ ************************************************************************--> + +<helpdocument version="1.0"> +<meta> +<topic id="textscalc01func_workdayxml" indexer="include" status="PUBLISH"> +<title id="tit" xml-lang="en-US">WORKDAY</title> +<filename>text/scalc/01/func_workday.xhp</filename> +</topic> +<history> +<created date="2004-05-19T17:10:11">Extracted from 04060102</created> +<lastedited date="2004-09-14T09:27:59"/> +</history> +</meta> <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3149012"><bookmark_value>WORKDAY</bookmark_value> +<bookmark xml-lang="en-US" branch="index" id="bm_id3149012"><bookmark_value>WORKDAY function</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_WORKDAY" id="bm_id3150028" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_WORKDAY" id="bm_id3150028" localize="false"/> <paragraph role="heading" id="hd_id3149012" xml-lang="en-US" level="2" l10n="U" oldref="186"><variable id="workday"><link href="text/scalc/01/func_workday.xhp">WORKDAY</link> -</variable></paragraph>
-<embed href="text/shared/00/00000001.xhp#add"/>
-<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="U" oldref="187"><ahelp hid="HID_AAI_FUNC_WORKDAY"> The result is a date number that can be formatted as a date. You then see the date of a day that is a certain number of <emph>Workdays</emph> away from the <emph>Start date</emph>.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146944" xml-lang="en-US" level="3" l10n="U" oldref="188">Syntax</paragraph>
-<paragraph role="paragraph" id="par_id3154844" xml-lang="en-US" l10n="U" oldref="189">WORKDAY (Start date;Days;Holidays)</paragraph>
-<paragraph role="paragraph" id="par_id3147469" xml-lang="en-US" l10n="U" oldref="190">
-<emph>Start date</emph>: 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 role="paragraph" id="par_id3153038" xml-lang="en-US" l10n="U" oldref="191">
-<emph>Days</emph>: the number of workdays. Positive value for a result after the start date, negative value for a result before the start date.</paragraph>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="192">
-<emph>Holidays</emph>: list of optional holidays. These are non-working days. Enter a cell range in which the holidays are listed individually.</paragraph>
-<paragraph role="heading" id="hd_id3150141" xml-lang="en-US" level="3" l10n="U" oldref="193">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152782" xml-lang="en-US" l10n="U" oldref="194">What date comes 17 workdays after 1 December 2001? Enter the start date "12/1/2001" in C3 and the number of workdays in D3. Cells F3 to J3 contain the following Christmas and New Year holidays: "12/24/2001", "12/25/2001", "12/26/2001", "12/31/2001", "1/1/2002".</paragraph>
-<paragraph role="paragraph" id="par_id3146142" xml-lang="en-US" l10n="CHG" oldref="195">=WORKDAY(C3;D3;F3:J3) returns 12/28/2001. Format the serial date number as a date.<comment>UFI: fixed #i30213#</comment></paragraph>
-</body>
-</helpdocument>
+</variable></paragraph> +<embed href="text/shared/00/00000001.xhp#add"/> +<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="U" oldref="187"><ahelp hid="HID_AAI_FUNC_WORKDAY"> The result is a date number that can be formatted as a date. You then see the date of a day that is a certain number of <emph>Workdays</emph> away from the <emph>Start date</emph>.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3146944" xml-lang="en-US" level="3" l10n="U" oldref="188">Syntax</paragraph> +<paragraph role="paragraph" id="par_id3154844" xml-lang="en-US" l10n="U" oldref="189">WORKDAY (Start date;Days;Holidays)</paragraph> +<paragraph role="paragraph" id="par_id3147469" xml-lang="en-US" l10n="U" oldref="190"> +<emph>Start date</emph>: 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 role="paragraph" id="par_id3153038" xml-lang="en-US" l10n="U" oldref="191"> +<emph>Days</emph>: the number of workdays. Positive value for a result after the start date, negative value for a result before the start date.</paragraph> +<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="192"> +<emph>Holidays</emph>: list of optional holidays. These are non-working days. Enter a cell range in which the holidays are listed individually.</paragraph> +<paragraph role="heading" id="hd_id3150141" xml-lang="en-US" level="3" l10n="U" oldref="193">Example</paragraph> +<paragraph role="paragraph" id="par_id3152782" xml-lang="en-US" l10n="U" oldref="194">What date comes 17 workdays after 1 December 2001? Enter the start date "12/1/2001" in C3 and the number of workdays in D3. Cells F3 to J3 contain the following Christmas and New Year holidays: "12/24/2001", "12/25/2001", "12/26/2001", "12/31/2001", "1/1/2002".</paragraph> +<paragraph role="paragraph" id="par_id3146142" xml-lang="en-US" l10n="CHG" oldref="195">=WORKDAY(C3;D3;F3:J3) returns 12/28/2001. Format the serial date number as a date.<comment>UFI: fixed #i30213#</comment></paragraph> +</body> +</helpdocument> diff --git a/helpcontent2/source/text/scalc/01/func_year.xhp b/helpcontent2/source/text/scalc/01/func_year.xhp index 0b43c5c57c..99d95fb790 100644 --- a/helpcontent2/source/text/scalc/01/func_year.xhp +++ b/helpcontent2/source/text/scalc/01/func_year.xhp @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> <!--*********************************************************************** * * The Contents of this file are made available subject to the terms of @@ -52,33 +52,33 @@ * Contributor(s): _______________________________________ * * - ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textscalc01func_yearxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">YEAR</title>
-<filename>text/scalc/01/func_year.xhp</filename>
-</topic>
-<history>
-<created date="2004-05-19T17:49:35"/>
-<lastedited date="2004-06-16T09:51:56"/>
-</history>
-</meta>
+ ************************************************************************--> + +<helpdocument version="1.0"> +<meta> +<topic id="textscalc01func_yearxml" indexer="include" status="PUBLISH"> +<title id="tit" xml-lang="en-US">YEAR</title> +<filename>text/scalc/01/func_year.xhp</filename> +</topic> +<history> +<created date="2004-05-19T17:49:35"/> +<lastedited date="2004-09-14T09:29:15"/> +</history> +</meta> <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3153982"><bookmark_value>YEAR</bookmark_value> +<bookmark xml-lang="en-US" branch="index" id="bm_id3153982"><bookmark_value>YEAR function</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/HID_FUNC_JAHR" id="bm_id3159179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_JAHR" id="bm_id3159179" localize="false"/> <paragraph role="heading" id="hd_id3153982" xml-lang="en-US" level="2" l10n="U" oldref="37"><variable id="year"><link href="text/scalc/01/func_year.xhp">YEAR</link> -</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147496" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="HID_FUNC_JAHR">Returns the year as a number according to the internal calculation rules.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146090" xml-lang="en-US" level="3" l10n="U" oldref="39">Syntax</paragraph>
-<paragraph role="paragraph" id="par_id3154304" xml-lang="en-US" l10n="U" oldref="40">YEAR(number)</paragraph>
-<paragraph role="paragraph" id="par_id3156013" xml-lang="en-US" l10n="U" oldref="41">
-<emph>Number</emph> shows the internal date value for which the year is to be returned.</paragraph>
-<paragraph role="heading" id="hd_id3152797" xml-lang="en-US" level="3" l10n="U" oldref="42">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3145668" xml-lang="en-US" l10n="U" oldref="43">Year(1) returns 1899</paragraph>
-<paragraph role="paragraph" id="par_id3151168" xml-lang="en-US" l10n="U" oldref="44">YEAR(2) returns 1900</paragraph>
-<paragraph role="paragraph" id="par_id3150115" xml-lang="en-US" l10n="U" oldref="45">YEAR(33333.33) returns 1991</paragraph>
-</body>
-</helpdocument>
+</variable></paragraph> +<paragraph role="paragraph" id="par_id3147496" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="HID_FUNC_JAHR">Returns the year as a number according to the internal calculation rules.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3146090" xml-lang="en-US" level="3" l10n="U" oldref="39">Syntax</paragraph> +<paragraph role="paragraph" id="par_id3154304" xml-lang="en-US" l10n="U" oldref="40">YEAR(number)</paragraph> +<paragraph role="paragraph" id="par_id3156013" xml-lang="en-US" l10n="U" oldref="41"> +<emph>Number</emph> shows the internal date value for which the year is to be returned.</paragraph> +<paragraph role="heading" id="hd_id3152797" xml-lang="en-US" level="3" l10n="U" oldref="42">Examples</paragraph> +<paragraph role="paragraph" id="par_id3145668" xml-lang="en-US" l10n="U" oldref="43">Year(1) returns 1899</paragraph> +<paragraph role="paragraph" id="par_id3151168" xml-lang="en-US" l10n="U" oldref="44">YEAR(2) returns 1900</paragraph> +<paragraph role="paragraph" id="par_id3150115" xml-lang="en-US" l10n="U" oldref="45">YEAR(33333.33) returns 1991</paragraph> +</body> +</helpdocument> diff --git a/helpcontent2/source/text/scalc/01/func_yearfrac.xhp b/helpcontent2/source/text/scalc/01/func_yearfrac.xhp index 424824efef..2e167832dd 100644 --- a/helpcontent2/source/text/scalc/01/func_yearfrac.xhp +++ b/helpcontent2/source/text/scalc/01/func_yearfrac.xhp @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> <!--*********************************************************************** * * The Contents of this file are made available subject to the terms of @@ -52,88 +52,88 @@ * Contributor(s): _______________________________________ * * - ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textscalc01func_yearfracxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">YEARFRAC</title>
-<filename>text/scalc/01/func_yearfrac.xhp</filename>
-</topic>
-<history>
-<created date="2004-05-19T17:17:34">extracted from 04060102</created>
-<lastedited date="2004-06-16T09:52:19"/>
-</history>
-</meta>
+ ************************************************************************--> + +<helpdocument version="1.0"> +<meta> +<topic id="textscalc01func_yearfracxml" indexer="include" status="PUBLISH"> +<title id="tit" xml-lang="en-US">YEARFRAC</title> +<filename>text/scalc/01/func_yearfrac.xhp</filename> +</topic> +<history> +<created date="2004-05-19T17:17:34">extracted from 04060102</created> +<lastedited date="2004-09-14T09:29:55"/> +</history> +</meta> <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3148735"><bookmark_value>YEARFRAC</bookmark_value> +<bookmark xml-lang="en-US" branch="index" id="bm_id3148735"><bookmark_value>YEARFRAC function</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_YEARFRAC" id="bm_id3149251" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_YEARFRAC" id="bm_id3149251" localize="false"/> <paragraph role="heading" id="hd_id3148735" xml-lang="en-US" level="2" l10n="U" oldref="196"><variable id="yearfrac"><link href="text/scalc/01/func_yearfrac.xhp">YEARFRAC</link> -</variable></paragraph>
-<embed href="text/shared/00/00000001.xhp#add"/>
-<paragraph role="paragraph" id="par_id3150899" xml-lang="en-US" l10n="U" oldref="197"><ahelp hid="HID_AAI_FUNC_YEARFRAC"> The result is a number between 0 and 1, representing the fraction of a year between <emph>Start date</emph> and <emph>End date</emph>.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155259" xml-lang="en-US" level="3" l10n="U" oldref="198">Syntax</paragraph>
-<paragraph role="paragraph" id="par_id3155823" xml-lang="en-US" l10n="U" oldref="199">YEARFRAC (Start date;End date;Basis)</paragraph>
-<paragraph role="paragraph" id="par_id3145144" xml-lang="en-US" l10n="U" oldref="200">
-<emph>Start date</emph> and <emph>end date</emph>: two date values.</paragraph>
-<section id="basis">
-<paragraph role="paragraph" id="par_id3149954" xml-lang="en-US" l10n="U" oldref="201">
-<emph>Basis</emph>: is chosen from a list of options and indicates how the year is to be calculated.</paragraph>
-<table id="tbl_id3145590">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="202">Basis</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155956" xml-lang="en-US" l10n="U" oldref="203">Calculation</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154502" xml-lang="en-US" l10n="U" oldref="204">0 or missing</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="205">US method (NASD), 12 months of 30 days each</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148766" xml-lang="en-US" l10n="U" oldref="250">1</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154326" xml-lang="en-US" l10n="U" oldref="206">Exact number of days in months, exact number of days in year</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145245" xml-lang="en-US" l10n="U" oldref="251">2</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155620" xml-lang="en-US" l10n="U" oldref="207">Exact number of days in month, year has 360 days</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145297" xml-lang="en-US" l10n="U" oldref="252">3</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148394" xml-lang="en-US" l10n="U" oldref="208">Exact number of days in month, year has 365 days</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151022" xml-lang="en-US" l10n="U" oldref="253">4</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150931" xml-lang="en-US" l10n="U" oldref="209">European method, 12 months of 30 days each</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-<paragraph role="heading" id="hd_id3145626" xml-lang="en-US" level="3" l10n="U" oldref="210">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149007" xml-lang="en-US" l10n="U" oldref="211">What fraction of the year 2001 lies between 1.1.2002 and 7.1.2001?</paragraph>
-<paragraph role="code" id="par_id3154632" xml-lang="en-US" l10n="U" oldref="212">=YEARFRAC("1.1.2002"; "7.1.2002";1) returns 0.495890.</paragraph>
-</body>
-</helpdocument>
+</variable></paragraph> +<embed href="text/shared/00/00000001.xhp#add"/> +<paragraph role="paragraph" id="par_id3150899" xml-lang="en-US" l10n="U" oldref="197"><ahelp hid="HID_AAI_FUNC_YEARFRAC"> The result is a number between 0 and 1, representing the fraction of a year between <emph>Start date</emph> and <emph>End date</emph>.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3155259" xml-lang="en-US" level="3" l10n="U" oldref="198">Syntax</paragraph> +<paragraph role="paragraph" id="par_id3155823" xml-lang="en-US" l10n="U" oldref="199">YEARFRAC (Start date;End date;Basis)</paragraph> +<paragraph role="paragraph" id="par_id3145144" xml-lang="en-US" l10n="U" oldref="200"> +<emph>Start date</emph> and <emph>end date</emph>: two date values.</paragraph> +<section id="basis"> +<paragraph role="paragraph" id="par_id3149954" xml-lang="en-US" l10n="U" oldref="201"> +<emph>Basis</emph>: is chosen from a list of options and indicates how the year is to be calculated.</paragraph> +<table id="tbl_id3145590"> +<tablerow> +<tablecell colspan="" rowspan=""> +<paragraph role="tablehead" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="202">Basis</paragraph> +</tablecell> +<tablecell colspan="" rowspan=""> +<paragraph role="tablehead" id="par_id3155956" xml-lang="en-US" l10n="U" oldref="203">Calculation</paragraph> +</tablecell> +</tablerow> +<tablerow> +<tablecell colspan="" rowspan=""> +<paragraph role="tablecontent" id="par_id3154502" xml-lang="en-US" l10n="U" oldref="204">0 or missing</paragraph> +</tablecell> +<tablecell colspan="" rowspan=""> +<paragraph role="tablecontent" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="205">US method (NASD), 12 months of 30 days each</paragraph> +</tablecell> +</tablerow> +<tablerow> +<tablecell colspan="" rowspan=""> +<paragraph role="tablecontent" id="par_id3148766" xml-lang="en-US" l10n="U" oldref="250">1</paragraph> +</tablecell> +<tablecell colspan="" rowspan=""> +<paragraph role="tablecontent" id="par_id3154326" xml-lang="en-US" l10n="U" oldref="206">Exact number of days in months, exact number of days in year</paragraph> +</tablecell> +</tablerow> +<tablerow> +<tablecell colspan="" rowspan=""> +<paragraph role="tablecontent" id="par_id3145245" xml-lang="en-US" l10n="U" oldref="251">2</paragraph> +</tablecell> +<tablecell colspan="" rowspan=""> +<paragraph role="tablecontent" id="par_id3155620" xml-lang="en-US" l10n="U" oldref="207">Exact number of days in month, year has 360 days</paragraph> +</tablecell> +</tablerow> +<tablerow> +<tablecell colspan="" rowspan=""> +<paragraph role="tablecontent" id="par_id3145297" xml-lang="en-US" l10n="U" oldref="252">3</paragraph> +</tablecell> +<tablecell colspan="" rowspan=""> +<paragraph role="tablecontent" id="par_id3148394" xml-lang="en-US" l10n="U" oldref="208">Exact number of days in month, year has 365 days</paragraph> +</tablecell> +</tablerow> +<tablerow> +<tablecell colspan="" rowspan=""> +<paragraph role="tablecontent" id="par_id3151022" xml-lang="en-US" l10n="U" oldref="253">4</paragraph> +</tablecell> +<tablecell colspan="" rowspan=""> +<paragraph role="tablecontent" id="par_id3150931" xml-lang="en-US" l10n="U" oldref="209">European method, 12 months of 30 days each</paragraph> +</tablecell> +</tablerow> +</table> + +</section> +<paragraph role="heading" id="hd_id3145626" xml-lang="en-US" level="3" l10n="U" oldref="210">Example</paragraph> +<paragraph role="paragraph" id="par_id3149007" xml-lang="en-US" l10n="U" oldref="211">What fraction of the year 2001 lies between 1.1.2002 and 7.1.2001?</paragraph> +<paragraph role="code" id="par_id3154632" xml-lang="en-US" l10n="U" oldref="212">=YEARFRAC("1.1.2002"; "7.1.2002";1) returns 0.495890.</paragraph> +</body> +</helpdocument> |