summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2019-06-12 17:14:10 +0200
committerEike Rathke <erack@redhat.com>2019-06-12 22:49:06 +0200
commit1436d2307d90f5ddbdcb0f129e59544306530342 (patch)
treec451c7754b1991eb4d86c661cfb524b447e52814 /connectivity
parentd18f31c4c9d6169f48f34bc53615a5a93a822aa7 (diff)
Resolves: tdf#125878 correct calculation of H:M:S from timestamp
This apparently has been wrong since the beginning in 2009. It's a somewhat odd algorithm anyway, first calculating the time in seconds, minutes and hours, but maybe there's a reason regarding rounding, so not changing that. Change-Id: I855d2c96094b4edb1095d20bcdfebdea6d6d943a Reviewed-on: https://gerrit.libreoffice.org/73893 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index f5dd3b61fcd2..681eb44a260d 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -186,8 +186,9 @@ void lcl_CalDate(sal_Int32 _nJulianDate,sal_Int32 _nJulianTime,css::util::DateTi
double d_m = d_s / 60.0;
double d_h = d_m / 60.0;
_rDateTime.Hours = static_cast<sal_uInt16>(d_h);
- _rDateTime.Minutes = static_cast<sal_uInt16>(d_m);
- _rDateTime.Seconds = static_cast<sal_uInt16>(( d_m - static_cast<double>(_rDateTime.Minutes) ) * 60.0);
+ _rDateTime.Minutes = static_cast<sal_uInt16>((d_h - static_cast<double>(_rDateTime.Hours)) * 60.0);
+ _rDateTime.Seconds = static_cast<sal_uInt16>(((d_m - static_cast<double>(_rDateTime.Minutes)) * 60.0)
+ - (static_cast<double>(_rDateTime.Hours) * 3600.0));
}
}