diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-04-19 07:14:48 +0200 |
---|---|---|
committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-04-19 07:17:34 +0200 |
commit | 202d45cff25492bb4d7f550df5c368af097d2e0c (patch) | |
tree | e585bce8549f7db112ce0c1b4762376bcf684e13 | |
parent | 81cf58f191f57b3cfad08f5c7d622b30f7fc72d9 (diff) |
date/time IDL datatypes incompatible change: fixup
Change-Id: I3733deac232d0075bdd889ce52d7e6f67746d4f8
-rw-r--r-- | sc/source/filter/orcus/interface.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index e67c915fd29a..a32842c8acd5 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -224,17 +224,17 @@ void ScOrcusSheet::set_date_time( SvNumberFormatter* pFormatter = mrDoc.getDoc().GetFormatTable(); Date aDate(day, month, year); - sal_uIntPtr nSec = floor(second); - sal_uIntPtr nSec100 = (second - nSec) * 100; - Time aTime(hour, minute, nSec, nSec100); + sal_uInt32 nSec = floor(second); + sal_uInt32 nNanoSec = (second - nSec) * ::Time::nanoSecPerSec; + Time aTime(hour, minute, nSec, nNanoSec); Date aNullDate(*pFormatter->GetNullDate()); long nDateDiff = aDate - aNullDate; double fTime = - static_cast<double>(aTime.GetNanoSec()) / 1e9 + + static_cast<double>(aTime.GetNanoSec()) / ::Time::nanoSecPerSec + aTime.GetSec() + - aTime.GetMin() * 60.0 + - aTime.GetHour() * 3600.0; + aTime.GetMin() * ::Time::secondPerMinute + + aTime.GetHour() * ::Time::secondPerHour; fTime /= DATE_TIME_FACTOR; |