diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-03 14:16:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-04 08:39:11 +0200 |
| commit | 6ce77cac03123f2bf5c9b6698a3f80e32d7fbe85 (patch) | |
| tree | abdd40004f9a98c3be7f37e8e0027639456cd688 /i18npool/inc/calendarImpl.hxx | |
| parent | f2db08b28e99c61c44bc057d03de926ac33d93b7 (diff) | |
move stuff in i18npool/i18nutil in own namespace
instead of trying to share the css::i18n namespace, which is just very
confusing and should be left to actual UNO artifacts
Change-Id: I2f5c36bf1af9a2a98c4f997dd450d015e75ed3f6
Reviewed-on: https://gerrit.libreoffice.org/43079
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool/inc/calendarImpl.hxx')
| -rw-r--r-- | i18npool/inc/calendarImpl.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx index ce0b9f66d2b0..aec643dcd59e 100644 --- a/i18npool/inc/calendarImpl.hxx +++ b/i18npool/inc/calendarImpl.hxx @@ -32,7 +32,7 @@ // class CalendarImpl -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { class CalendarImpl : public cppu::WeakImplHelper < @@ -55,7 +55,7 @@ public: // Methods virtual void SAL_CALL loadDefaultCalendar(const css::lang::Locale& rLocale) override; virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) override; - virtual Calendar SAL_CALL getLoadedCalendar() override; + virtual css::i18n::Calendar SAL_CALL getLoadedCalendar() override; virtual css::uno::Sequence < OUString > SAL_CALL getAllCalendars(const css::lang::Locale& rLocale) override; virtual OUString SAL_CALL getUniqueID() override; virtual void SAL_CALL setDateTime(double fTimeInDays) override; @@ -70,19 +70,19 @@ public: virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() override; virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() override; virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() override; - virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() override; - virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() override; + virtual css::uno::Sequence < css::i18n::CalendarItem > SAL_CALL getMonths() override; + virtual css::uno::Sequence < css::i18n::CalendarItem > SAL_CALL getDays() override; virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) override; // Methods in XExtendedCalendar virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) override; // XCalendar3 - virtual Calendar2 SAL_CALL getLoadedCalendar2() override; - virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() override; - virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() override; - virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() override; - virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() override; + virtual css::i18n::Calendar2 SAL_CALL getLoadedCalendar2() override; + virtual css::uno::Sequence < css::i18n::CalendarItem2 > SAL_CALL getDays2() override; + virtual css::uno::Sequence < css::i18n::CalendarItem2 > SAL_CALL getMonths2() override; + virtual css::uno::Sequence < css::i18n::CalendarItem2 > SAL_CALL getGenitiveMonths2() override; + virtual css::uno::Sequence < css::i18n::CalendarItem2 > SAL_CALL getPartitiveMonths2() override; // XCalendar4 virtual void SAL_CALL setLocalDateTime(double TimeInDays) override; @@ -105,7 +105,7 @@ private: css::uno::Reference < css::i18n::XCalendar4 > xCalendar; }; -} } } } +} #endif |