diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-28 00:43:19 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-07-15 11:46:41 +0000 |
| commit | 652ccbdf3111766fadc379a8cf4650b744e1e19c (patch) | |
| tree | 5efdab367c4da4ac6c62ad1e228b77648cc62aed /forms | |
| parent | a8e8d46020702c64ff314adbe87e6f21e73e1999 (diff) | |
i#108348 API CHANGE: add IsUTC to css.util.DateTime etc.
Add IsUTC member to:
com.sun.star.util.DateTime
com.sun.star.util.DateTimeRange
com.sun.star.util.Time
Add new stucts with explicit time zones:
com.sun.star.util.DateTimeWithTimezone
com.sun.star.util.DateWithTimezone
com.sun.star.util.TimeWithTimezone
Adapt the sax::Converter to read/write timezones, and fix the unit test.
Everything else just uses default (no time zone), this commit is just
to fix the API.
STRUCT: /UCR/com/sun/star/util/DateTime
nFields1 = 7 != nFields2 = 8
Registry2 contains 1 more fields
STRUCT: /UCR/com/sun/star/util/DateTimeRange
nFields1 = 14 != nFields2 = 15
Registry2 contains 1 more fields
STRUCT: /UCR/com/sun/star/util/Time
nFields1 = 4 != nFields2 = 5
Registry2 contains 1 more fields
Conflicts:
sc/source/filter/oox/unitconverter.cxx
Change-Id: I01f7a6d082a6b090c8efe71d2de137474c495c18
Reviewed-on: https://gerrit.libreoffice.org/4833
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/xforms/convert.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index a89ef2bedf7d..651ecc1f89b2 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.cxx @@ -338,7 +338,7 @@ namespace // ------------------------------------------------------------------------ UNOTime lcl_toUNOTime( const OUString& rString ) { - UNOTime aTime( 0, 0, 0, 0 ); + UNOTime aTime; bool bWellformed = ISO8601parseTime(rString, aTime); @@ -362,7 +362,7 @@ namespace // all okay? if ( !bWellformed ) - return UNOTime( 0, 0, 0, 0 ); + return UNOTime(); return aTime; } @@ -382,7 +382,8 @@ namespace UNODate aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year ); OUString sDate = lcl_toXSD_UNODate_typed( aDate ); - UNOTime aTime( aDateTime.NanoSeconds, aDateTime.Seconds, aDateTime.Minutes, aDateTime.Hours ); + UNOTime const aTime( aDateTime.NanoSeconds, aDateTime.Seconds, + aDateTime.Minutes, aDateTime.Hours, aDateTime.IsUTC); OUString sTime = lcl_toXSD_UNOTime_typed( aTime ); OUStringBuffer sInfo; @@ -405,7 +406,6 @@ namespace if ( nDateTimeSep == -1 ) { // no time part aDate = lcl_toUNODate( rString ); - aTime = UNOTime( 0, 0, 0, 0 ); } else { @@ -414,7 +414,7 @@ namespace } UNODateTime aDateTime( aTime.NanoSeconds, aTime.Seconds, aTime.Minutes, aTime.Hours, - aDate.Day, aDate.Month, aDate.Year + aDate.Day, aDate.Month, aDate.Year, aTime.IsUTC ); return makeAny( aDateTime ); } |