diff options
| author | Eike Rathke <erack@redhat.com> | 2017-05-04 19:57:05 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-05-04 19:57:05 +0200 |
| commit | 727765e3fcf246c9b8adc27097c89e5678e8b910 (patch) | |
| tree | d7b8bee77cd8b117db6715f7d9b13021a923f1f7 | |
| parent | ba4ed13b45fc390205c1f888f805b56c62994a11 (diff) | |
Remove erroneous commit of source/text/sbasic/shared/03030108.xhp.rej
Change-Id: I2d5cb2f514d1a1564868d0abf442cd01ff28e7c7
| -rw-r--r-- | source/text/sbasic/shared/03030108.xhp.rej | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/source/text/sbasic/shared/03030108.xhp.rej b/source/text/sbasic/shared/03030108.xhp.rej deleted file mode 100644 index 45fcd1f0f3..0000000000 --- a/source/text/sbasic/shared/03030108.xhp.rej +++ /dev/null @@ -1,14 +0,0 @@ -diff a/source/text/sbasic/shared/03030108.xhp b/source/text/sbasic/shared/03030108.xhp (rejected hunks) -@@ -34,7 +34,11 @@ - <bookmark xml-lang="en-US" branch="index" id="bm_id3153127"><bookmark_value>CdateFromIso function</bookmark_value> - </bookmark> - <paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/03030108.xhp" name="CDateFromIso Function [Runtime]">CDateFromIso Function [Runtime]</link></paragraph> --<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="2">Returns the internal date number from a string that contains a date in ISO format.</paragraph> -+<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="2">Returns the internal date number from a string that contains a date in ISO format (YYYYMMDD or YYYY-MM-DD).</paragraph> -+<paragraph id="par_id3148551" role="paragraph" xml-lang="en-US">The year part must consist of either two (supported only in YYMMDD format without separators for compatibility) or at least four digits. With four digits leading zeros must be given if the absolute value is less than 1000, it can be negative with a leading minus sign if the date passed denotes a year before the common area (BCE) and it can have more than four digits if the absolute value is greater than 9999. The formatted string can be in the range "-327680101" to "327671231", or "-32768-01-01" to "32767-12-31".</paragraph> -+<paragraph id="par_id3148552" role="paragraph" xml-lang="en-US">An invalid date results in an error. Year 0 is not accepted, the last day BCE is -0001-12-31 and the next day CE is 0001-01-01. Dates before 1582-10-15 are in the proleptic Gregorian calendar.</paragraph> -+<paragraph id="par_id3148553" role="tip" xml-lang="en-US">When converting a date serial number to a printable string, for example for the Print or MsgBox command, the locale's default calendar is used and at that 1582-10-15 cutover date may switch to the Julian calendar, which can result in a different date being displayed than expected. Use the <link href="text/sbasic/shared/03030107.xhp" name="CDateToIso Function [Runtime]">CDateToIso Function [Runtime]</link> to convert such date number to a string representation in the proleptic Gregorian calendar.</paragraph> -+<paragraph id="par_id3148554" role="note" xml-lang="en-US">The YYYY-MM-DD format with separators is supported since %PRODUCTNAME 5.3.4. Years less than 100 or greater than 9999 are accepted since %PRODUCTNAME 5.4 if not in VBA compatibility mode.</paragraph> - </section> - <paragraph role="heading" id="hd_id3148947" xml-lang="en-US" level="2" l10n="U" oldref="3">Syntax:</paragraph> - <bascode> |