[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - include/osl oox/source ucb/source

[Lionel Elie Mamane]

 include/osl/time.h                            |    2 +-
 oox/source/docprop/docprophandler.cxx         |    2 +-
 ucb/source/ucp/webdav-neon/DateTimeHelper.cxx |    4 ++--
 ucb/source/ucp/webdav/DateTimeHelper.cxx      |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0fc41b8a89d9cfabf146657fb01c58a158056360
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Jul 5 12:11:42 2013 +0200

    API change: oslDateTime signed year
    
    to match the rest of our date-related data structures,
    which were recently switched to signed year.
    
    Change-Id: Ic4f1e424b130fd2ccca379adbe0a66836b6cac41
    Reviewed-on: https://gerrit.libreoffice.org/4735
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>
    (cherry picked from commit 51745327e55ad5ffb5df620142c27c0ad956ef1d)

diff --git a/include/osl/time.h b/include/osl/time.h
index 4be9e72..6bb48f2 100644
--- a/include/osl/time.h
+++ b/include/osl/time.h
@@ -92,7 +92,7 @@ typedef struct _oslDateTime
     /*----------------------------------------------------------------------*/
     /** is the year.
     */
-    sal_uInt16 Year;
+    sal_Int16 Year;
 
 } oslDateTime;
 
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 6f15245..e7ecd97 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -97,7 +97,7 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString& aChar
     sal_Int32 nLen = aChars.getLength();
     if ( nLen >= 4 )
     {
-        aOslDTime.Year = (sal_uInt16)aChars.copy( 0, 4 ).toInt32();
+        aOslDTime.Year = (sal_Int16)aChars.copy( 0, 4 ).toInt32();
 
         if ( nLen >= 7 && aChars.getStr()[4] == (sal_Unicode)'-' )
         {
diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx
index 4bf2ea8..ce99c2d 100644
--- a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx
+++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx
@@ -89,7 +89,7 @@ bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s,
     aDateTime.Day         = sal::static_int_cast< sal_uInt16 >(day); // 1-31
     aDateTime.DayOfWeek   = 0;          // 0-6, 0 = Sunday
     aDateTime.Month       = sal::static_int_cast< sal_uInt16 >(month); // 1-12
-    aDateTime.Year        = sal::static_int_cast< sal_uInt16 >(year);
+    aDateTime.Year        = sal::static_int_cast< sal_Int16  >(year);
 
     TimeValue aTimeValue;
     if ( osl_getTimeValueFromDateTime( &aDateTime, &aTimeValue ) )
@@ -206,7 +206,7 @@ bool DateTimeHelper::RFC2068_To_DateTime (const OUString& s,
             aDateTime.DayOfWeek   = 0; //dayofweek;  // 0-6, 0 = Sunday
             aDateTime.Month       = sal::static_int_cast< sal_uInt16 >(month);
                 // 1-12
-            aDateTime.Year        = sal::static_int_cast< sal_uInt16 >(year);
+            aDateTime.Year        = sal::static_int_cast< sal_Int16  >(year);
 
             TimeValue aTimeValue;
             if ( osl_getTimeValueFromDateTime( &aDateTime,
diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx
index c4ccbca..7ca9a3d 100644
--- a/ucb/source/ucp/webdav/DateTimeHelper.cxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx
@@ -79,7 +79,7 @@ bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s,
     aDateTime.Day         = sal::static_int_cast< sal_uInt16 >(day); // 1-31
     aDateTime.DayOfWeek   = 0;          // 0-6, 0 = Sunday
     aDateTime.Month       = sal::static_int_cast< sal_uInt16 >(month); // 1-12
-    aDateTime.Year        = sal::static_int_cast< sal_uInt16 >(year);
+    aDateTime.Year        = sal::static_int_cast< sal_Int16  >(year);
 
     TimeValue aTimeValue;
     if ( osl_getTimeValueFromDateTime( &aDateTime, &aTimeValue ) )
@@ -218,7 +218,7 @@ bool DateTimeHelper::RFC2068_To_DateTime (const OUString& s,
             aDateTime.DayOfWeek   = 0; //dayofweek;  // 0-6, 0 = Sunday
             aDateTime.Month       = sal::static_int_cast< sal_uInt16 >(month);
                 // 1-12
-            aDateTime.Year        = sal::static_int_cast< sal_uInt16 >(year);
+            aDateTime.Year        = sal::static_int_cast< sal_Int16  >(year);
 
             TimeValue aTimeValue;
             if ( osl_getTimeValueFromDateTime( &aDateTime,