i18npool/source/calendar/calendarImpl.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 913120fe50ee770e60bd82e2e60047242872111a Author: Lionel Elie Mamane <lio...@mamane.lu> AuthorDate: Wed Jul 10 10:27:19 2019 +0200 Commit: Tomáš Chvátal <tchva...@suse.cz> CommitDate: Tue Jul 30 13:56:59 2019 +0200 build failure - disambiguate Calendar return class Change-Id: I892281f85f6cc9c2de2c341ae63240ae85d302c4 Reviewed-on: https://gerrit.libreoffice.org/76595 Reviewed-by: Tomáš Chvátal <tchva...@suse.cz> Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu> Tested-by: Jenkins diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index c9e22f7bc9b7..228bed358b09 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -128,7 +128,7 @@ CalendarImpl::getLoadedCalendar2() return xCalendar->getLoadedCalendar2(); } -Calendar SAL_CALL +::css::i18n::Calendar SAL_CALL CalendarImpl::getLoadedCalendar() { if (!xCalendar.is()) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits