[Libreoffice-commits] core.git: sw/source

Michael Stahl mstahl at redhat.com
Mon Feb 2 10:50:44 PST 2015


 sw/source/core/fields/docufld.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f0bd9c2fd68c519992722faffe58e2ba8a02d4ed
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Feb 2 16:53:45 2015 +0100

    tdf#88899: sw: fix expanding of SwDocInfoField with DateTime
    
    The lcl_TimeToDouble function produced very small numbers that round to
    zero.
    (regression from 9830fd36dbdb72c79703b0c61efc027fba793c5a)
    
    Change-Id: I091da9c2a913fae0c2bbf229942db3c1bd3598f4
    Reviewed-on: https://gerrit.libreoffice.org/14282
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 862db52..255de7a 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1023,7 +1023,7 @@ template<class T>
 static double lcl_TimeToDouble( const T& rTime )
 {
     const double fNanoSecondsPerDay = 86400000000000.0;
-    return ((rTime.Hours*3600000)+(rTime.Minutes*60000)+(rTime.Seconds*1000)+(rTime.NanoSeconds)) / fNanoSecondsPerDay;
+    return ((rTime.Hours*3600000000000LL)+(rTime.Minutes*60000000000LL)+(rTime.Seconds*1000000000LL)+(rTime.NanoSeconds)) / fNanoSecondsPerDay;
 }
 
 template<class D>


More information about the Libreoffice-commits mailing list