diff options
| author | Rene Engelhard <rene@debian.org> | 2020-11-01 18:30:49 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2020-11-02 17:48:35 +0100 |
| commit | 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 (patch) | |
| tree | 1a40bb91fd9d0a536161299771caff658c661991 /i18npool/source | |
| parent | tdf#98868 re-register cloned TOXMark if the dest doc is different (diff) | |
| download | core-0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878.tar.gz core-0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878.zip | |
fix build with ICU 68
use standard true.
/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)':
/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope
363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
| ^~~~
/usr/include/unicode/umachine.h says:
@deprecated ICU 68 Use standard "true" instead.
Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'i18npool/source')
| -rw-r--r-- | i18npool/source/calendar/calendar_gregorian.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index b7ae49fbd96e..59ee46fa0e0f 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); int32_t nZoneOffset, nDSTOffset; UErrorCode status = U_ZERO_ERROR; - body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); + body->getTimeZone().getOffset( fR, +#if U_ICU_VERSION_MAJOR_NUM >= 68 + true, +#else + TRUE, +#endif + nZoneOffset, nDSTOffset, status ); + if ( !U_SUCCESS(status) ) throw ERROR; status = U_ZERO_ERROR; body->setTime( fR - (nZoneOffset + nDSTOffset), status ); |