1 files changed, 12 insertions, 12 deletions
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index a62f93da542b..15a591f37429 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -31,7 +31,7 @@
 //  class Calendar_gregorian
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 const sal_uInt8 kDisplayEraForcedLongYear = 0x01;
 
@@ -42,7 +42,7 @@ struct Era {
     sal_uInt8 flags;
 };
 
-const sal_Int16 FIELD_INDEX_COUNT = CalendarFieldIndex::FIELD_COUNT2;
+const sal_Int16 FIELD_INDEX_COUNT = css::i18n::CalendarFieldIndex::FIELD_COUNT2;
 
 class Calendar_gregorian : public CalendarImpl
 {
@@ -66,7 +66,7 @@ public:
     virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) override;
     virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) override;
     virtual sal_Bool SAL_CALL isValid() override;
-    virtual Calendar SAL_CALL getLoadedCalendar() override;
+    virtual css::i18n:: Calendar SAL_CALL getLoadedCalendar() override;
     virtual OUString SAL_CALL getUniqueID() override;
     virtual sal_Int16 SAL_CALL getFirstDayOfWeek() override;
     virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) override;
@@ -74,19 +74,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;
@@ -118,7 +118,7 @@ protected:
     OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode );
 
 private:
-    Calendar2 aCalendar;
+    css::i18n::Calendar2 aCalendar;
 
     /** Submit fieldSetValue array according to fieldSet.
 
@@ -187,7 +187,7 @@ public:
     virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) override;
 };
 
-} } } }
+}
 
 #endif