From 202d45cff25492bb4d7f550df5c368af097d2e0c Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Fri, 19 Apr 2013 07:14:48 +0200 Subject: date/time IDL datatypes incompatible change: fixup Change-Id: I3733deac232d0075bdd889ce52d7e6f67746d4f8 --- sc/source/filter/orcus/interface.cxx | 12 ++++++------ 1 file 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(aTime.GetNanoSec()) / 1e9 + + static_cast(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; -- cgit