i18npool/source/calendar/calendarImpl.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
New commits: commit 71674ab6a7472132ca2eee1381e3273bd6b35a7b Author: Eike Rathke <er...@redhat.com> AuthorDate: Thu Jun 27 13:25:37 2019 +0200 Commit: Eike Rathke <er...@redhat.com> CommitDate: Thu Jun 27 15:36:22 2019 +0200 Fix name clash problem Reportedly there can be confusion between names css::lang::Locale and icu::Locale if explicit namespaces are omitted due to (the bad habit of using) the using directive, since commit 942de6a01ba990e5f3bc55ce4ab3737a03f67f39 CommitDate: Thu Jun 20 01:57:20 2019 +0200 Resolves: tdf#92503 introduce TimeZone to calendar loading and default to UTC Rightly, because that via inclusion of calendar_gregorian.hxx pulls in unicode/calendar.h which in turn ... Didn't happen in TDF builds so far. Change-Id: Ie7fb7fce0ab5cd4b93fbbfd3abe04d7d18a8a081 Reviewed-on: https://gerrit.libreoffice.org/74795 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Jenkins diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index f0962104a4b0..c9e22f7bc9b7 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::i18n; -using namespace ::com::sun::star::lang; namespace i18npool { @@ -41,7 +40,7 @@ CalendarImpl::~CalendarImpl() } void SAL_CALL -CalendarImpl::loadDefaultCalendarTZ( const Locale& rLocale, const OUString& rTimeZone ) +CalendarImpl::loadDefaultCalendarTZ( const css::lang::Locale& rLocale, const OUString& rTimeZone ) { Sequence< Calendar2 > xC = LocaleDataImpl::get()->getAllCalendars2(rLocale); for (sal_Int32 i = 0; i < xC.getLength(); i++) { @@ -54,7 +53,7 @@ CalendarImpl::loadDefaultCalendarTZ( const Locale& rLocale, const OUString& rTim } void SAL_CALL -CalendarImpl::loadCalendarTZ( const OUString& uniqueID, const Locale& rLocale, const OUString& rTimeZone ) +CalendarImpl::loadCalendarTZ( const OUString& uniqueID, const css::lang::Locale& rLocale, const OUString& rTimeZone ) { Reference < XCalendar4 > xOldCalendar( xCalendar ); // backup const OUString aCacheID( uniqueID + "_" + rTimeZone); @@ -138,7 +137,7 @@ CalendarImpl::getLoadedCalendar() } Sequence< OUString > SAL_CALL -CalendarImpl::getAllCalendars( const Locale& rLocale ) +CalendarImpl::getAllCalendars( const css::lang::Locale& rLocale ) { Sequence< Calendar2 > xC = LocaleDataImpl::get()->getAllCalendars2(rLocale); sal_Int32 nLen = xC.getLength(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits