diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 15:49:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-01 07:34:23 +0000 |
| commit | fc04f76336fdf8c96e35382cdeb497e2f939705c (patch) | |
| tree | 70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /i18npool | |
| parent | eb4811590c85895ce531674596bdd6afb3397725 (diff) | |
fdo#82577: Handle Time
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11
Time typedef.
Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866
Reviewed-on: https://gerrit.libreoffice.org/11684
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/calendar/calendar_gregorian.cxx | 2 | ||||
| -rw-r--r-- | i18npool/source/calendar/calendar_hijri.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index ee9084433462..c09432dca484 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -646,7 +646,7 @@ void Calendar_gregorian::setValue() throw(RuntimeException) DUMP_ICU_CAL_MSG(("%s\n","setValue() after Zone/DST glitch resubmit")); DUMP_I18N_CAL_MSG(("%s\n","setValue() after Zone/DST glitch resubmit")); - // Time zone transition => resubmit. + // tools::Time zone transition => resubmit. // TZ=America/St_Johns date <= 1935-03-30 // -3:30:52 (!) instead of -3:30 // if first submission included time zone -3:30 that would be wrong. diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx index a0200417fa39..b1381d8c7efd 100644 --- a/i18npool/source/calendar/calendar_hijri.cxx +++ b/i18npool/source/calendar/calendar_hijri.cxx @@ -115,7 +115,7 @@ Calendar_hijri::NewMoon(sal_Int32 n) { double jd, t, t2, t3, k, ma, sa, tf, xtra; k = n; - t = k/1236.85; // Time in Julian centuries from 1900 January 0.5 + t = k/1236.85; // tools::Time in Julian centuries from 1900 January 0.5 t2 = t * t; t3 = t2 * t; @@ -160,7 +160,7 @@ Calendar_hijri::NewMoon(sal_Int32 n) + 0.0010 * sin(tf - ma) + 0.0005 * sin(sa + 2 * ma); - // convert from Ephemeris Time (ET) to (approximate) Universal Time (UT) + // convert from Ephemeris tools::Time (ET) to (approximate) Universal tools::Time (UT) jd += xtra - (0.41 + 1.2053 * t + 0.4992 * t2)/1440; return (jd); |