diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:35:12 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:35:12 +0000 |
| commit | af5ca66f106c096dffc84ce5f476bee210aab0f3 (patch) | |
| tree | 3d166ee2969579f02d7594ac6bf4815f64e473da /ucb/source/ucp | |
| parent | ab94b167d830657fe4614d9617135c29b01a007d (diff) | |
INTEGRATION: CWS warnings01 (1.5.10); FILE MERGED
2006/03/10 15:40:13 sb 1.5.10.2: #i53898# Made code warning-free.
2005/11/10 17:15:26 pl 1.5.10.1: #i55991# removed warnings
Diffstat (limited to 'ucb/source/ucp')
| -rw-r--r-- | ucb/source/ucp/webdav/DateTimeHelper.cxx | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx index 4633179c0bde..acbdd62d9d75 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: DateTimeHelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-09 16:09:19 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:35:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -83,7 +83,7 @@ bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s, n = sscanf( aDT.getStr(), "%04d-%02d-%02dT%02d:%02d:%lf-%02d:%02d", &year, &month, &day, &hours, &minutes, &seconds, &off_hours, &off_minutes ); - if ( n = 8 ) + if ( n == 8 ) { fix = off_hours * 3600 + off_minutes * 60; } @@ -98,13 +98,13 @@ bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s, oslDateTime aDateTime; aDateTime.NanoSeconds = 0; - aDateTime.Seconds = static_cast< int >( seconds ); // 0-59 - aDateTime.Minutes = minutes; // 0-59 - aDateTime.Hours = hours; // 0-23 - aDateTime.Day = day; // 1-31 + aDateTime.Seconds = sal::static_int_cast< sal_uInt16 >(seconds); // 0-59 + aDateTime.Minutes = sal::static_int_cast< sal_uInt16 >(minutes); // 0-59 + aDateTime.Hours = sal::static_int_cast< sal_uInt16 >(hours); // 0-23 + aDateTime.Day = sal::static_int_cast< sal_uInt16 >(day); // 1-31 aDateTime.DayOfWeek = 0; // 0-6, 0 = Sunday - aDateTime.Month = month; // 1-12 - aDateTime.Year = year; + aDateTime.Month = sal::static_int_cast< sal_uInt16 >(month); // 1-12 + aDateTime.Year = sal::static_int_cast< sal_uInt16 >(year); TimeValue aTimeValue; if ( osl_getTimeValueFromDateTime( &aDateTime, &aTimeValue ) ) @@ -205,7 +205,7 @@ bool DateTimeHelper::RFC2068_To_DateTime (const OUString& s, { // RFC 1036 found = sscanf (aDT.getStr(), "%3s, %2d-%3s-%2d %2d:%2d:%2d GMT", - string_day, &day, &string_month, &year, &hours, &minutes, &seconds); + string_day, &day, string_month, &year, &hours, &minutes, &seconds); } found = (found == 7) ? 1 : 0; } @@ -232,13 +232,18 @@ bool DateTimeHelper::RFC2068_To_DateTime (const OUString& s, oslDateTime aDateTime; aDateTime.NanoSeconds = 0; - aDateTime.Seconds = seconds; // 0-59 - aDateTime.Minutes = minutes; // 0-59 - aDateTime.Hours = hours; // 0-23 - aDateTime.Day = day; // 1-31 + aDateTime.Seconds = sal::static_int_cast< sal_uInt16 >(seconds); + // 0-59 + aDateTime.Minutes = sal::static_int_cast< sal_uInt16 >(minutes); + // 0-59 + aDateTime.Hours = sal::static_int_cast< sal_uInt16 >(hours); + // 0-23 + aDateTime.Day = sal::static_int_cast< sal_uInt16 >(day); + // 1-31 aDateTime.DayOfWeek = 0; //dayofweek; // 0-6, 0 = Sunday - aDateTime.Month = month; // 1-12 - aDateTime.Year = year; + aDateTime.Month = sal::static_int_cast< sal_uInt16 >(month); + // 1-12 + aDateTime.Year = sal::static_int_cast< sal_uInt16 >(year); TimeValue aTimeValue; if ( osl_getTimeValueFromDateTime( &aDateTime, |