User: hr Date: 06/06/19 18:05:39 Modified: /dba/connectivity/source/commontools/ dbconversion.cxx
Log: INTEGRATION: CWS warnings01 (1.23.30); FILE MERGED 2006/04/20 14:52:03 sb 1.23.30.3: #i53898# Made code compile and/or warning-free again after resync to SRC680m162. 2006/04/07 20:15:12 sb 1.23.30.2: RESYNC: (1.23-1.24); FILE MERGED 2005/12/22 11:44:04 fs 1.23.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbconversion.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbconversion.cxx?r1=1.24&r2=1.25 Delta lines: +24 -24 --------------------- --- dbconversion.cxx 14 Mar 2006 10:47:30 -0000 1.24 +++ dbconversion.cxx 20 Jun 2006 01:05:37 -0000 1.25 @@ -256,7 +256,7 @@ do { nTempDays = nDays; - rYear = ((nTempDays / 365) - i); + rYear = (sal_uInt16)((nTempDays / 365) - i); nTempDays -= (rYear-1) * 365; nTempDays -= ((rYear-1) / 4) - ((rYear-1) / 100) + ((rYear-1) / 400); bCalc = sal_False; @@ -285,7 +285,7 @@ nTempDays -= implDaysInMonth( rMonth, rYear ); rMonth++; } - rDay = nTempDays; + rDay = (sal_uInt16)nTempDays; } //------------------------------------------------------------------------------ sal_Int32 DBTypeConversion::toDays(const Date& _rVal, const Date& _rNullDate) @@ -395,10 +395,10 @@ sal_Int32 nSeconds = nHundredthSeconds / 100; sal_Int32 nMinutes = nSeconds / 60; - xRet.HundredthSeconds = nHundredthSeconds % 100; - xRet.Seconds = nSeconds % 60; - xRet.Hours = nMinutes / 60; - xRet.Minutes = nMinutes % 60; + xRet.HundredthSeconds = (sal_uInt16)(nHundredthSeconds % 100); + xRet.Seconds = (sal_uInt16)(nSeconds % 60); + xRet.Hours = (sal_uInt16)(nMinutes / 60); + xRet.Minutes = (sal_uInt16)(nMinutes % 60); // Zeit zusammenbauen sal_Int32 nTime = (sal_Int32)(xRet.HundredthSeconds + (xRet.Seconds*100) + (xRet.Minutes*10000) + (xRet.Hours*1000000)) * nSign; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
