diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-24 12:57:52 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-24 12:57:52 +0000 |
| commit | 74f140095a128c9e87a529b15c86ab23cafdd79b (patch) | |
| tree | 9e2a5eb0eb02bf84fd49d178ebe9c8a80eb100a4 | |
| parent | 118142e9b11521c715c07401707cc0815a698701 (diff) | |
INTEGRATION: CWS hcshared15 (1.4.266); FILE MERGED
2008/01/11 14:00:18 ufi 1.4.266.2: new makefiles und zwischenstand
2007/12/18 12:12:16 ufi 1.4.266.1: saving
4 files changed, 76 insertions, 71 deletions
diff --git a/helpcontent2/source/text/scalc/01/func_timevalue.xhp b/helpcontent2/source/text/scalc/01/func_timevalue.xhp index 6b3c8a2073..ba82c303f3 100644 --- a/helpcontent2/source/text/scalc/01/func_timevalue.xhp +++ b/helpcontent2/source/text/scalc/01/func_timevalue.xhp @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--*********************************************************************** + +<!-- + *********************************************************************** * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: func_timevalue.xhp,v $ + * $RCSfile: func_timevalue.xhp,v $fileonly,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:06:26 $ + * last change: $Author: vg $ $Date: 2008-01-24 13:56:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,33 +34,32 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - ************************************************************************--> - -<helpdocument version="1.0"> + ************************************************************************ + --> + + + <helpdocument version="1.0"> <meta> <topic id="textscalc01func_timevaluexml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">TIMEVALUE </title> <filename>/text/scalc/01/func_timevalue.xhp</filename> </topic> -<history> -<created date="2004-05-27T16:47:35"/> -<lastedited date="2004-07-20T14:24:37"/> -</history> </meta> <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3146755"><bookmark_value>TIMEVALUE function</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEITWERT" id="bm_id3146767" localize="false"/> -<paragraph role="heading" id="hd_id3146755" xml-lang="en-US" level="2" l10n="U" oldref="160"><variable id="timevalue"><link href="text/scalc/01/func_timevalue.xhp">TIMEVALUE</link> +<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEITWERT" id="bm_id3146767" localize="false"/><paragraph role="heading" id="hd_id3146755" xml-lang="en-US" level="2" l10n="U" oldref="160"><variable id="timevalue"><link href="text/scalc/01/func_timevalue.xhp">TIMEVALUE</link> </variable></paragraph> <paragraph role="paragraph" id="par_id3148502" xml-lang="en-US" l10n="U" oldref="161"><ahelp hid="HID_FUNC_ZEITWERT">TIMEVALUE returns the internal time number from a text enclosed by quotes and which may show a possible time entry format.</ahelp></paragraph> <paragraph role="paragraph" id="par_id3150794" xml-lang="en-US" l10n="U" oldref="162">The internal number indicated as a decimal is the result of the date system used under $[officename] to calculate date entries.</paragraph> <paragraph role="heading" id="hd_id3150810" xml-lang="en-US" level="3" l10n="U" oldref="163">Syntax</paragraph> -<paragraph role="paragraph" id="par_id3150823" xml-lang="en-US" l10n="U" oldref="164">TIMEVALUE("Text")</paragraph> +<paragraph role="code" id="par_id3150823" xml-lang="en-US" l10n="U" oldref="164">TIMEVALUE("Text")</paragraph> <paragraph role="paragraph" id="par_id3152556" xml-lang="en-US" l10n="U" oldref="165"> <emph>Text</emph> is a valid time expression and must be entered in quotation marks.</paragraph> <paragraph role="heading" id="hd_id3146815" xml-lang="en-US" level="3" l10n="U" oldref="166">Examples</paragraph> -<paragraph role="paragraph" id="par_id3146829" xml-lang="en-US" l10n="U" oldref="167">TIMEVALUE("4PM") returns 0.67. When formatting in time format HH:MM:SS, you then get 16:00:00.</paragraph> -<paragraph role="paragraph" id="par_id3153632" xml-lang="en-US" l10n="U" oldref="168">TIMEVALUE("24:00") returns 1. If you use the HH:MM:SS time format, the value is 00:00:00.</paragraph> +<paragraph role="paragraph" id="par_id3146829" xml-lang="en-US" l10n="U" oldref="167"> +<item type="input">=TIMEVALUE("4PM")</item> returns 0.67. When formatting in time format HH:MM:SS, you then get 16:00:00.</paragraph> +<paragraph role="paragraph" id="par_id3153632" xml-lang="en-US" l10n="U" oldref="168"> +<item type="input">=TIMEVALUE("24:00")</item> returns 1. If you use the HH:MM:SS time format, the value is 00:00:00.</paragraph> </body> </helpdocument> diff --git a/helpcontent2/source/text/scalc/01/func_weekday.xhp b/helpcontent2/source/text/scalc/01/func_weekday.xhp index 69f26835e6..9aecd13186 100644 --- a/helpcontent2/source/text/scalc/01/func_weekday.xhp +++ b/helpcontent2/source/text/scalc/01/func_weekday.xhp @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--*********************************************************************** + +<!-- + *********************************************************************** * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: func_weekday.xhp,v $ + * $RCSfile: func_weekday.xhp,v $fileonly,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:07:08 $ + * last change: $Author: vg $ $Date: 2008-01-24 13:57:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,38 +34,39 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - ************************************************************************--> - -<helpdocument version="1.0"> + ************************************************************************ + --> + + + <helpdocument version="1.0"> <meta> <topic id="textscalc01func_weekdayxml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">WEEKDAY </title> <filename>/text/scalc/01/func_weekday.xhp</filename> </topic> -<history> -<created date="2004-05-27T16:43:42"/> -<lastedited date="2004-09-27T12:14:40">YJ: checked</lastedited> -</history> </meta> <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3154925"><bookmark_value>WEEKDAY function</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WOCHENTAG" id="bm_id3152359" localize="false"/> -<paragraph role="heading" id="hd_id3154925" xml-lang="en-US" level="2" l10n="U" oldref="136"><variable id="weekday"><link href="text/scalc/01/func_weekday.xhp">WEEKDAY</link> +<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WOCHENTAG" id="bm_id3152359" localize="false"/><paragraph role="heading" id="hd_id3154925" xml-lang="en-US" level="2" l10n="U" oldref="136"><variable id="weekday"><link href="text/scalc/01/func_weekday.xhp">WEEKDAY</link> </variable></paragraph> -<paragraph role="paragraph" id="par_id3154228" xml-lang="en-US" l10n="U" oldref="137"><ahelp hid="HID_FUNC_WOCHENTAG">Returns the day of the week for the given date value.</ahelp> The day is returned as an integer between 1 (Sunday) and 7 (Saturday) if no type or type = 1 is specified. If type=2, numbering begins at Monday=1; and if type=3 numbering begins at Monday=0.</paragraph> +<paragraph role="paragraph" id="par_id3154228" xml-lang="en-US" l10n="U" oldref="137"><ahelp hid="HID_FUNC_WOCHENTAG">Returns the day of the week for the given date value.</ahelp> The day is returned as an integer between 1 (Sunday) and 7 (Saturday) if no type or type=1 is specified. If type=2, numbering begins at Monday=1; and if type=3 numbering begins at Monday=0.</paragraph> <paragraph role="heading" id="hd_id3147217" xml-lang="en-US" level="3" l10n="U" oldref="138">Syntax</paragraph> -<paragraph role="paragraph" id="par_id3149033" xml-lang="en-US" l10n="U" oldref="139">WEEKDAY(Number; Type)</paragraph> +<paragraph role="code" id="par_id3149033" xml-lang="en-US" l10n="U" oldref="139">WEEKDAY(Number; Type)</paragraph> <paragraph role="paragraph" id="par_id3149046" xml-lang="en-US" l10n="U" oldref="140"> <emph>Number</emph>, as a date value, is a decimal for which the weekday is to be returned.</paragraph> <paragraph role="paragraph" id="par_id3154394" xml-lang="en-US" l10n="U" oldref="141"> -<emph>Type</emph> determines the type of calculation. For Type =1, the weekdays are counted starting from Sunday (this is the default even when the Type parameter is missing). For Type =2, the weekdays are counted starting from Monday =1. For Type = 3, the weekdays are counted starting from Monday = 0.</paragraph> +<emph>Type</emph> determines the type of calculation. For Type=1, the weekdays are counted starting from Sunday (this is the default even when the Type parameter is missing). For Type=2, the weekdays are counted starting from Monday=1. For Type=3, the weekdays are counted starting from Monday=0.</paragraph> <paragraph role="note" id="par_id3156188" xml-lang="en-US" l10n="U" oldref="142">These values apply only to the standard date format that you select under <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph>.</paragraph> <paragraph role="heading" id="hd_id3153836" xml-lang="en-US" level="3" l10n="U" oldref="143">Examples</paragraph> -<paragraph role="paragraph" id="par_id3150317" xml-lang="en-US" l10n="U" oldref="144">WEEKDAY("6/14/2000") returns 4 (the Type parameter is missing, therefore the standard count is used. The standard count starts with Sunday as day number 1. June 14, 2000 was a Wednesday and therefore day number 4).</paragraph> -<paragraph role="paragraph" id="par_id3153174" xml-lang="en-US" l10n="U" oldref="145">WEEKDAY("7/24/1996";2) returns 3 (the Type parameter is 2, therefore Monday is day number 1. July 24, 1996 was a Wednesday and therefore day number 3).</paragraph> -<paragraph role="paragraph" id="par_id3153525" xml-lang="en-US" l10n="U" oldref="146">WEEKDAY("7/24/1996";1) returns 4 (the Type parameter is 1, therefore Sunday is day number 1. July 24, 1996 was a Wednesday and therefore day number 4).</paragraph> -<paragraph role="paragraph" id="par_id3150575" xml-lang="en-US" l10n="U" oldref="147">WEEKDAY(NOW()) returns the number of the current day.</paragraph> +<paragraph role="paragraph" id="par_id3150317" xml-lang="en-US" l10n="U" oldref="144"> +<item type="input">=WEEKDAY(6/14/2000)</item> returns 4 (the Type parameter is missing, therefore the standard count is used. The standard count starts with Sunday as day number 1. June 14, 2000 was a Wednesday and therefore day number 4).</paragraph> +<paragraph role="paragraph" id="par_id3153174" xml-lang="en-US" l10n="U" oldref="145"> +<item type="input">=WEEKDAY(7/24/1996;2)</item> returns 3 (the Type parameter is 2, therefore Monday is day number 1. July 24, 1996 was a Wednesday and therefore day number 3).</paragraph> +<paragraph role="paragraph" id="par_id3153525" xml-lang="en-US" l10n="U" oldref="146"> +<item type="input">=WEEKDAY(7/24/1996;1)</item> returns 4 (the Type parameter is 1, therefore Sunday is day number 1. July 24, 1996 was a Wednesday and therefore day number 4).</paragraph> +<paragraph role="paragraph" id="par_id3150575" xml-lang="en-US" l10n="U" oldref="147"> +<item type="input">=WEEKDAY(NOW())</item> returns the number of the current day.</paragraph> <paragraph role="tip" id="par_id3150588" xml-lang="en-US" l10n="U" oldref="171">To obtain a function indicating whether a day in A1 is a business day, use the IF and WEEKDAY functions as follows: IF(WEEKDAY(A1;2)<6;"Business day";"Weekend")</paragraph> </body> </helpdocument> diff --git a/helpcontent2/source/text/scalc/01/func_weeknum.xhp b/helpcontent2/source/text/scalc/01/func_weeknum.xhp index 75835af971..0de248ce0b 100644 --- a/helpcontent2/source/text/scalc/01/func_weeknum.xhp +++ b/helpcontent2/source/text/scalc/01/func_weeknum.xhp @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--*********************************************************************** + +<!-- + *********************************************************************** * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: func_weeknum.xhp,v $ + * $RCSfile: func_weeknum.xhp,v $fileonly,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:07:32 $ + * last change: $Author: vg $ $Date: 2008-01-24 13:57:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,29 +34,26 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - ************************************************************************--> - -<helpdocument version="1.0"> + ************************************************************************ + --> + + + <helpdocument version="1.0"> <meta> <topic id="textscalc01func_weeknumxml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">WEEKNUM</title> <filename>/text/scalc/01/func_weeknum.xhp</filename> </topic> -<history> -<created date="2004-05-19T17:51:58"/> -<lastedited date="2004-09-27T15:49:54">YJ: checked</lastedited> -</history> </meta> <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3159161"><bookmark_value>WEEKNUM function</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KALENDERWOCHE" id="bm_id3158403" localize="false"/> -<paragraph role="heading" id="hd_id3159161" xml-lang="en-US" level="2" l10n="U" oldref="54"><variable id="weeknum"><link href="text/scalc/01/func_weeknum.xhp">WEEKNUM</link> +<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KALENDERWOCHE" id="bm_id3158403" localize="false"/><paragraph role="heading" id="hd_id3159161" xml-lang="en-US" level="2" l10n="U" oldref="54"><variable id="weeknum"><link href="text/scalc/01/func_weeknum.xhp">WEEKNUM</link> </variable></paragraph> <paragraph role="paragraph" id="par_id3149770" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_FUNC_KALENDERWOCHE">WEEKNUM calculates the week number of the year for the internal date value.</ahelp></paragraph> -<paragraph role="note" id="par_idN105E4" xml-lang="en-US" l10n="NEW">The International Standard ISO 8601 has decreed that Monday shall be the first day of the week. A week that lies partly in one year and partly in another is assigned a number in the year in which most of its days lie. That means that week number 1 of any year is the week that contains the January 4<emph>th</emph>.<comment>UFI: see http://www.openoffice.org/issues/show_bug.cgi?id=33709</comment></paragraph> +<paragraph role="note" id="par_idN105E4" xml-lang="en-US" l10n="NEW">The International Standard ISO 8601 has decreed that Monday shall be the first day of the week. A week that lies partly in one year and partly in another is assigned a number in the year in which most of its days lie. That means that week number 1 of any year is the week that contains the January 4th.<comment>UFI: see http://www.openoffice.org/issues/show_bug.cgi?id=33709</comment></paragraph> <paragraph role="heading" id="hd_id3153055" xml-lang="en-US" level="3" l10n="U" oldref="56">Syntax</paragraph> -<paragraph role="paragraph" id="par_id3147236" xml-lang="en-US" l10n="U" oldref="57">WEEKNUM(number; mode)</paragraph> +<paragraph role="code" id="par_id3147236" xml-lang="en-US" l10n="U" oldref="57">WEEKNUM(Number; Mode)</paragraph> <paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="58"> <emph>Number</emph> is the internal date number.</paragraph> <paragraph role="paragraph" id="par_id3154269" xml-lang="en-US" l10n="U" oldref="59"> @@ -62,7 +61,9 @@ <paragraph role="paragraph" id="par_id3148930" xml-lang="en-US" l10n="U" oldref="60">1 = Sunday</paragraph> <paragraph role="paragraph" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="61">2 = Monday</paragraph> <paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3" l10n="U" oldref="62">Examples</paragraph> -<paragraph role="paragraph" id="par_id3150704" xml-lang="en-US" l10n="U" oldref="65">WEEKNUM("1/1/95";1) returns 1 (1/1/95 was a Sunday)</paragraph> -<paragraph role="paragraph" id="par_id3149792" xml-lang="en-US" l10n="U" oldref="64">WEEKNUM("1/1/95";2) returns 52. If the week starts on Monday, Sunday belongs to the last week of the previous year.</paragraph> +<paragraph role="paragraph" id="par_id3150704" xml-lang="en-US" l10n="U" oldref="65"> +<item type="input">=WEEKNUM(1/1/95;1)</item> returns 1 (1/1/95 was a Sunday)</paragraph> +<paragraph role="paragraph" id="par_id3149792" xml-lang="en-US" l10n="U" oldref="64"> +<item type="input">=WEEKNUM(1/1/95;2)</item> returns 52. If the week starts on Monday, Sunday belongs to the last week of the previous year.</paragraph> </body> </helpdocument> diff --git a/helpcontent2/source/text/scalc/01/func_weeknumadd.xhp b/helpcontent2/source/text/scalc/01/func_weeknumadd.xhp index 1a8ba21933..68913e507f 100644 --- a/helpcontent2/source/text/scalc/01/func_weeknumadd.xhp +++ b/helpcontent2/source/text/scalc/01/func_weeknumadd.xhp @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--*********************************************************************** + +<!-- + *********************************************************************** * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: func_weeknumadd.xhp,v $ + * $RCSfile: func_weeknumadd.xhp,v $fileonly,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:08:02 $ + * last change: $Author: vg $ $Date: 2008-01-24 13:57:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,36 +34,34 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - ************************************************************************--> - -<helpdocument version="1.0"> + ************************************************************************ + --> + + + <helpdocument version="1.0"> <meta> <topic id="textscalc01func_weeknumaddxml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">WEEKNUM_ADD </title> <filename>/text/scalc/01/func_weeknumadd.xhp</filename> </topic> -<history> -<created date="2004-05-19T17:53:59"/> -<lastedited date="2004-09-29T10:14:29">YJ: checked</lastedited> -</history> </meta> <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3166443"><bookmark_value>WEEKNUM_ADD function</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_WEEKNUM" id="bm_id3166454" localize="false"/> -<paragraph role="heading" id="hd_id3166443" xml-lang="en-US" level="2" l10n="U" oldref="222"><variable id="weeknumadd"><link href="text/scalc/01/func_weeknumadd.xhp">WEEKNUM_ADD</link> +<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_WEEKNUM" id="bm_id3166454" localize="false"/><paragraph role="heading" id="hd_id3166443" xml-lang="en-US" level="2" l10n="U" oldref="222"><variable id="weeknumadd"><link href="text/scalc/01/func_weeknumadd.xhp">WEEKNUM_ADD</link> </variable></paragraph> <embed href="text/shared/00/00000001.xhp#add"/> -<paragraph role="paragraph" id="par_id3152945" xml-lang="en-US" l10n="U" oldref="223"><ahelp hid="HID_AAI_FUNC_WEEKNUM">The result indicates the number of the calendar week for a <emph>Date</emph>.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3152945" xml-lang="en-US" l10n="U" oldref="223"><ahelp hid="HID_AAI_FUNC_WEEKNUM">The result indicates the number of the calendar week for a date.</ahelp></paragraph> <paragraph role="tip" id="par_idN105DD" xml-lang="en-US" l10n="NEW">The WEEKNUM_ADD function is designed to calculate week numbers exactly as Microsoft Excel does. Use the <link href="text/scalc/01/func_weeknum.xhp">WEEKNUM</link> function, or format your date cells using the WW formatting code, when you need ISO 8601 week numbers.</paragraph> <paragraph role="heading" id="hd_id3153745" xml-lang="en-US" level="3" l10n="U" oldref="224">Syntax</paragraph> -<paragraph role="paragraph" id="par_id3153685" xml-lang="en-US" l10n="U" oldref="225">WEEKNUM_ADD(Date;Return type)</paragraph> +<paragraph role="code" id="par_id3153685" xml-lang="en-US" l10n="U" oldref="225">WEEKNUM_ADD(Date; ReturnType)</paragraph> <paragraph role="paragraph" id="par_id3159277" xml-lang="en-US" l10n="U" oldref="226"> -<emph>Date</emph>: the date within the calendar week.</paragraph> +<emph>Date</emph> is the date within the calendar week.</paragraph> <paragraph role="paragraph" id="par_id3154098" xml-lang="en-US" l10n="U" oldref="227"> -<emph>Return type</emph>: 1 for week beginning on a Sunday, 2 for week beginning on a Monday.</paragraph> +<emph>ReturnType</emph> is 1 for week beginning on a Sunday, 2 for week beginning on a Monday.</paragraph> <paragraph role="heading" id="hd_id3152886" xml-lang="en-US" level="3" l10n="U" oldref="228">Example</paragraph> <paragraph role="paragraph" id="par_id3149973" xml-lang="en-US" l10n="U" oldref="229">In which week number does 12.24.2001 fall?</paragraph> -<paragraph role="paragraph" id="par_id3149914" xml-lang="en-US" l10n="U" oldref="230">=WEEKNUM_ADD("24.12.2001";1) returns 52.</paragraph> +<paragraph role="paragraph" id="par_id3149914" xml-lang="en-US" l10n="U" oldref="230"> +<item type="input">=WEEKNUM_ADD(24.12.2001;1)</item> returns 52.</paragraph> </body> </helpdocument> |