diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-28 00:43:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-15 16:54:56 +0200 |
| commit | dd780228cca25dc818ca7fdb628ff607c109618e (patch) | |
| tree | cec08040b1cd42296773a557fc821951615e9c3b /svtools | |
| parent | eb426753811befc69b3929146ac68cb97f92f7b0 (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
Reviewed-on: https://gerrit.libreoffice.org/4833
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 652ccbdf3111766fadc379a8cf4650b744e1e19c)
i#108348: fix TimeZone -> Timezone in struct names
(cherry picked from commit 604aae1fd240254fe851d93dc35b5408bd13296c)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu>
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
Conflicts:
forms/source/xforms/convert.cxx
offapi/type_reference/offapi.rdb
reportdesign/source/core/sdr/RptObject.cxx
sc/source/filter/oox/unitconverter.cxx
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index c0237203d63c..9866c95211d5 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -97,7 +97,8 @@ namespace svt && _rLHS.Hours == _rRHS.Hours && _rLHS.Day == _rRHS.Day && _rLHS.Month == _rRHS.Month - && _rLHS.Year == _rRHS.Year; + && _rLHS.Year == _rRHS.Year + && _rLHS.IsUTC == _rRHS.IsUTC; } //--------------------------------------------------------------------- diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index a95ec7958b74..90809ecec9b3 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -2187,7 +2187,8 @@ bool HTMLParser::ParseMetaOptionsImpl( ::util::DateTime uDT(aDateTime.GetNanoSec(), aDateTime.GetSec(), aDateTime.GetMin(), aDateTime.GetHour(), aDateTime.GetDay(), - aDateTime.GetMonth(), aDateTime.GetYear()); + aDateTime.GetMonth(), aDateTime.GetYear(), + false); if ( HTML_META_CREATED==nAction ) i_xDocProps->setCreationDate( uDT ); else |