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>

43 files changed, 189 insertions, 194 deletions

diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 8ae8d254d9b7..a357db248712 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -34,14 +34,14 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class BreakIterator
 
 class BreakIteratorImpl : public cppu::WeakImplHelper
 <
-    XBreakIterator,
+    css::i18n::XBreakIterator,
     css::lang::XServiceInfo
 >
 {
@@ -57,11 +57,11 @@ public:
         const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
         sal_Int32& nDone ) override;
 
-    virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
+    virtual css::i18n::Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int16 WordType) override;
-    virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
+    virtual css::i18n::Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int16 WordType) override;
-    virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
+    virtual css::i18n::Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
         const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) override;
 
     virtual sal_Bool SAL_CALL isBeginWord( const OUString& Text, sal_Int32 nPos,
@@ -76,9 +76,10 @@ public:
     virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale ) override;
 
-    virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
+    virtual css::i18n::LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
+        const css::i18n::LineBreakHyphenationOptions& hOptions,
+        const css::i18n::LineBreakUserOptions& bOptions ) override;
 
     virtual sal_Int16 SAL_CALL getScriptType( const OUString& Text, sal_Int32 nPos ) override;
     virtual sal_Int32 SAL_CALL beginOfScript( const OUString& Text, sal_Int32 nStartPos,
@@ -106,7 +107,7 @@ public:
 
     static sal_Int16 SAL_CALL getScriptClass(sal_uInt32 currentChar);
 protected:
-    Boundary result; // for word break iterator
+    css::i18n::Boundary result; // for word break iterator
 
 private:
 
@@ -127,10 +128,7 @@ private:
 
 };
 
-} // i18n
-} // star
-} // sun
-} // com
+} // i18npool
 
 
 #endif // INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index 1ec97dc7fae8..61f3f5424f14 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -24,7 +24,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 //  class BreakIterator_CJK
 
@@ -33,15 +33,16 @@ class BreakIterator_CJK : public BreakIterator_Unicode
 public:
     BreakIterator_CJK();
 
-    Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
+    css::i18n::Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
             const css::lang::Locale& nLocale, sal_Int16 WordType) override;
-    Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
+    css::i18n::Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
             const css::lang::Locale& nLocale, sal_Int16 WordType) override;
-    Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
+    css::i18n::Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
             const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) override;
-    LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
+    css::i18n::LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
+        const css::i18n::LineBreakHyphenationOptions& hOptions,
+        const css::i18n::LineBreakUserOptions& bOptions ) override;
 
 protected:
     std::unique_ptr<xdictionary> m_xDict;
@@ -61,7 +62,7 @@ BREAKITERATOR_CJK( ko )
 
 #undef BREAKITERATOR__CJK
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_BREAKITERATOR_CJK_HXX
 
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index 24fec512af72..747de34c64e7 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.hxx
@@ -22,7 +22,7 @@
 #include <breakiterator_unicode.hxx>
 #include <xdictionary.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class BreakIterator_CTL
@@ -33,14 +33,15 @@ public:
     BreakIterator_CTL();
     virtual ~BreakIterator_CTL() override;
     virtual sal_Int32 SAL_CALL previousCharacters(const OUString& text, sal_Int32 start,
-        const lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
+        const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
         sal_Int32& nDone) override;
     virtual sal_Int32 SAL_CALL nextCharacters(const OUString& text, sal_Int32 start,
-        const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
+        const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
         sal_Int32& nDone) override;
-    virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
+    virtual css::i18n::LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
+        const css::i18n::LineBreakHyphenationOptions& hOptions,
+        const css::i18n::LineBreakUserOptions& bOptions ) override;
 protected:
     OUString cachedText; // for cell index
     sal_Int32* nextCellIndex;
@@ -51,7 +52,7 @@ protected:
     virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos);
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index 5e2eddca019c..b43c6d9fd958 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
 #include <breakiterator_ctl.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class BreakIterator_th
@@ -35,7 +35,7 @@ protected:
     void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) override;
 };
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
 
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index c9e644e31f42..1dc60cafbe69 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -25,7 +25,7 @@
 #include <memory>
 #include <unordered_map>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define LOAD_CHARACTER_BREAKITERATOR    0
 #define LOAD_WORD_BREAKITERATOR         1
@@ -48,11 +48,11 @@ public:
         const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
         sal_Int32& nDone ) override;
 
-    virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
+    virtual css::i18n::Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int16 WordType) override;
-    virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
+    virtual css::i18n::Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int16 WordType) override;
-    virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
+    virtual css::i18n::Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
         const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) override;
 
     virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
@@ -60,9 +60,10 @@ public:
     virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale ) override;
 
-    virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
+    virtual css::i18n::LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
+        const css::i18n::LineBreakHyphenationOptions& hOptions,
+        const css::i18n::LineBreakUserOptions& bOptions ) override;
 
     //XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
@@ -103,7 +104,7 @@ public:
     typedef std::unordered_map< OString, std::shared_ptr< BI_ValueData >, OStringHash > BIMap;
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/bullet.h b/i18npool/inc/bullet.h
index c1f144326df5..9852625b09c0 100644
--- a/i18npool/inc/bullet.h
+++ b/i18npool/inc/bullet.h
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 static const sal_Unicode table_AIUFullWidth_ja_JP[] = {
     0x30A2, // KATAKANA LETTER A
@@ -320,6 +320,6 @@ static const sal_Unicode table_DiZi_zh[] = {
     0x5b50,0x4e11,0x5bc5,0x536f,0x8fb0,0x5df3,0x5348,0x672a,0x7533,0x9149,0x620c,0x4ea5
 };
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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
 
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
 
diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx
index 71f96767c089..31e2fc6d6bfc 100644
--- a/i18npool/inc/calendar_hijri.hxx
+++ b/i18npool/inc/calendar_hijri.hxx
@@ -25,7 +25,7 @@
 //  class Calendar_hijri
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class Calendar_hijri : public Calendar_gregorian
 {
@@ -70,7 +70,7 @@ private:
     static double getJulianDay(sal_Int32 day, sal_Int32 month, sal_Int32 year);
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx
index db2ec2b1a8aa..91343e3ebb57 100644
--- a/i18npool/inc/calendar_jewish.hxx
+++ b/i18npool/inc/calendar_jewish.hxx
@@ -25,7 +25,7 @@
 //  class Calendar_jewish
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class Calendar_jewish : public Calendar_gregorian
 {
@@ -41,7 +41,7 @@ protected:
     void mapFromGregorian() override;
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 287df8e69170..bfa80c169ee0 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -60,9 +60,9 @@ namespace o3tl {
 }
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
-class cclass_Unicode : public cppu::WeakImplHelper < XCharacterClassification, css::lang::XServiceInfo >
+class cclass_Unicode : public cppu::WeakImplHelper < css::i18n::XCharacterClassification, css::lang::XServiceInfo >
 {
 public:
     cclass_Unicode(const css::uno::Reference < css::uno::XComponentContext >& rxContext );
@@ -81,10 +81,10 @@ public:
         const css::lang::Locale& rLocale ) override;
     virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos, sal_Int32 nCount,
         const css::lang::Locale& rLocale ) override;
-    virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
+    virtual css::i18n::ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
         const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart,
         sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) override;
-    virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text,
+    virtual css::i18n::ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text,
         sal_Int32 nPos, const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
         const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
         const OUString& userDefinedCharactersCont ) override;
@@ -126,7 +126,7 @@ private:
 
     /// used for parser only
     css::lang::Locale    aParserLocale;
-    css::uno::Reference < XLocaleData4 > mxLocaleData;
+    css::uno::Reference < css::i18n::XLocaleData4 > mxLocaleData;
     css::uno::Reference < css::i18n::XNativeNumberSupplier > xNatNumSup;
     OUString             aStartChars;
     OUString             aContChars;
@@ -168,7 +168,7 @@ private:
     void destroyParserTable();
 
     /// Parse a text.
-    void parseText( ParseResult& r, const OUString& rText, sal_Int32 nPos,
+    void parseText( css::i18n::ParseResult& r, const OUString& rText, sal_Int32 nPos,
         sal_Int32 nTokenType = 0xffffffff );
 
     /// Setup International class, new'ed only if different from existing.
@@ -179,7 +179,7 @@ private:
 
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index ba890d5d3b6a..0f75860137d0 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.hxx
@@ -22,7 +22,7 @@
 #include <collatorImpl.hxx>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 //      ----------------------------------------------------
 //      class ChapterCollator
@@ -46,10 +46,10 @@ public:
 
 private:
     // CharacterClassification Implementation
-    css::uno::Reference< XCharacterClassification > cclass;
+    css::uno::Reference< css::i18n::XCharacterClassification > cclass;
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 659b34210f9c..290418152622 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -26,11 +26,11 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class CharacterClassificationImpl : public cppu::WeakImplHelper
 <
-    XCharacterClassification,
+    css::i18n::XCharacterClassification,
     css::lang::XServiceInfo
 >
 {
@@ -52,11 +52,11 @@ public:
         const css::lang::Locale& rLocale ) override;
     virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos,
         sal_Int32 nCount, const css::lang::Locale& rLocale ) override;
-    virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
+    virtual css::i18n::ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
         const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
         const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
         const OUString& userDefinedCharactersCont ) override;
-    virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType,
+    virtual css::i18n::ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType,
         const OUString& Text, sal_Int32 nPos, const css::lang::Locale& rLocale,
         sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart,
         sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) override;
@@ -92,7 +92,7 @@ private:
 
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/chartonum.hxx b/i18npool/inc/chartonum.hxx
index 27107fda50c9..4824c1e505a3 100644
--- a/i18npool/inc/chartonum.hxx
+++ b/i18npool/inc/chartonum.hxx
@@ -22,7 +22,7 @@
 
 #include <transliteration_Numeric.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define TRANSLITERATION_CHARTONUM( name ) \
 class CharToNum##name : public transliteration_Numeric \
@@ -48,7 +48,7 @@ TRANSLITERATION_CHARTONUM(_th)
 
 #undef TRANSLITERATION_CHARTONUM
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_CHARTONUM_HXX
 
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 62f1e0a430dd..b6f9dd25f791 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -30,13 +30,14 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
+
 //      ----------------------------------------------------
 //      class CollatorImpl
 //      ----------------------------------------------------
 class CollatorImpl : public cppu::WeakImplHelper
 <
-    XCollator,
+    css::i18n::XCollator,
     css::lang::XServiceInfo
 >
 {
@@ -53,15 +54,15 @@ public:
     virtual sal_Int32 SAL_CALL compareString( const OUString& s1,
         const OUString& s2) override;
 
-    virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale,  sal_Int32 collatorOptions) override;
+    virtual sal_Int32 SAL_CALL loadDefaultCollator( const css::lang::Locale& rLocale,  sal_Int32 collatorOptions) override;
 
-    virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(  const OUString& impl, const lang::Locale& rLocale,
+    virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(  const OUString& impl, const css::lang::Locale& rLocale,
         sal_Int32 collatorOptions) override;
 
-    virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString& impl, const lang::Locale& rLocale,
+    virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString& impl, const css::lang::Locale& rLocale,
         const css::uno::Sequence< sal_Int32 >& collatorOptions) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const css::lang::Locale& rLocale ) override;
 
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName ) override;
 
@@ -71,16 +72,16 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
-    lang::Locale nLocale;
+    css::lang::Locale nLocale;
 private:
     struct lookupTableItem {
-        lang::Locale aLocale;
+        css::lang::Locale aLocale;
         OUString algorithm;
         OUString service;
         css::uno::Reference < XCollator > xC;
-        lookupTableItem(const lang::Locale& rLocale, const OUString& _algorithm, const OUString& _service,
+        lookupTableItem(const css::lang::Locale& rLocale, const OUString& _algorithm, const OUString& _service,
                         css::uno::Reference < XCollator > const & _xC) : aLocale(rLocale), algorithm(_algorithm), service(_service), xC(_xC) {}
-        bool SAL_CALL equals(const lang::Locale& rLocale, const OUString& _algorithm) {
+        bool SAL_CALL equals(const css::lang::Locale& rLocale, const OUString& _algorithm) {
         return aLocale.Language == rLocale.Language &&
             aLocale.Country == rLocale.Country &&
             aLocale.Variant == rLocale.Variant &&
@@ -93,16 +94,16 @@ private:
     // Service Factory
     css::uno::Reference < css::uno::XComponentContext > m_xContext;
     // lang::Locale Data
-    css::uno::Reference < XLocaleData4 >                mxLocaleData;
+    css::uno::Reference < css::i18n::XLocaleData4 >     mxLocaleData;
 
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL createCollator(const lang::Locale& rLocale, const OUString& serviceName,
+    bool SAL_CALL createCollator(const css::lang::Locale& rLocale, const OUString& serviceName,
         const OUString& rSortAlgorithm);
     /// @throws css::uno::RuntimeException
-    void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm);
+    void SAL_CALL loadCachedCollator(const css::lang::Locale& rLocale, const OUString& rSortAlgorithm);
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index 3487b44b7600..1ec407517a56 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -30,9 +30,9 @@
 //      class Collator_Unicode
 //      ----------------------------------------------------
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
-class Collator_Unicode : public cppu::WeakImplHelper < XCollator, css::lang::XServiceInfo >
+class Collator_Unicode : public cppu::WeakImplHelper < css::i18n::XCollator, css::lang::XServiceInfo >
 {
 public:
     // Constructors
@@ -45,15 +45,15 @@ public:
 
     sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) override;
 
-    sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale,
+    sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const css::lang::Locale& rLocale,
         sal_Int32 collatorOptions) override;
 
 
     // following 4 methods are implemented in collatorImpl.
-    sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&,  sal_Int32) override {throw css::uno::RuntimeException();}
-    void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString&, const lang::Locale&,
+    sal_Int32 SAL_CALL loadDefaultCollator( const css::lang::Locale&,  sal_Int32) override {throw css::uno::RuntimeException();}
+    void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString&, const css::lang::Locale&,
         const css::uno::Sequence< sal_Int32 >&) override {throw css::uno::RuntimeException();}
-    css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&) override {throw css::uno::RuntimeException();}
+    css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const css::lang::Locale&) override {throw css::uno::RuntimeException();}
     css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& ) override {throw css::uno::RuntimeException();}
 
     //XServiceInfo
@@ -70,7 +70,7 @@ private:
 #endif
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index d487ec1c4914..966db83233a5 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -32,7 +32,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class DefaultNumberingProvider : public cppu::WeakImplHelper
 <
@@ -81,7 +81,9 @@ private:
     /// @throws css::uno::RuntimeException
     bool SAL_CALL isScriptFlagEnabled(const OUString& aName );
 };
-} } } }
+
+}
+
 
 #endif
 
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index 006b9fa47e87..4d8e33b76358 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class IndexEntrySupplier
@@ -87,7 +87,7 @@ protected:
     OUString          aSortAlgorithm;
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index 15194ac7a62c..fc2b52dcd82a 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -23,7 +23,7 @@
 #include <indexentrysupplier_common.hxx>
 #include <osl/module.h>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class IndexEntrySupplier_asian
@@ -51,7 +51,7 @@ private:
 #endif
 };
 
-} } } }
+}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index bdd042fe779b..65ae1b62f200 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -28,7 +28,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class IndexEntrySupplier_Common
@@ -91,7 +91,7 @@ protected:
         const OUString& PhoneticEntry, const css::lang::Locale& rLocale );
 };
 
-} } } }
+}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index 0de94706ac2f..c1c48bf3daf1 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -23,7 +23,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class Index;
 
@@ -101,7 +101,7 @@ public:
     sal_Int16 compare(sal_Unicode c1, sal_Unicode c2);
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index 7749c867253f..48ce3183da7d 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -22,7 +22,7 @@
 
 #include <indexentrysupplier_common.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class IndexEntrySupplier_ja_phonetic
@@ -59,7 +59,7 @@ INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_consonant )
 INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_last_by_syllable )
 INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_last_by_consonant )
 
-} } } }
+}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index b0ed20a14bd9..094113a8ca74 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -27,7 +27,7 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class InputSequenceCheckerImpl
@@ -73,7 +73,7 @@ private:
     static sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
 };
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HXX
 
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index 19918857498b..d87eaea5ebf1 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.hxx
@@ -21,10 +21,7 @@
 
 #include <inputsequencechecker.hxx>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace i18n {
+namespace i18npool {
 
 
 //  class InputSequenceChecker_hi
@@ -42,7 +39,7 @@ public:
         sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index e0ae2a9d689c..5b612f11ad07 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.hxx
@@ -21,7 +21,7 @@
 
 #include <inputsequencechecker.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class InputSequenceChecker_th
@@ -39,7 +39,7 @@ public:
         sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
 };
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_TH_HXX
 
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index c89710cc49b3..503722f96c03 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -57,7 +57,7 @@
 
 struct LocaleDataLookupTableItem;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class LocaleDataImpl : public cppu::WeakImplHelper
 <
@@ -81,18 +81,18 @@ public:
         excluding the one obtained via getFirstLocaleServiceName() */
     static ::std::vector< OUString > getFallbackLocaleServiceNames( const css::lang::Locale & rLocale );
 
-    virtual LanguageCountryInfo SAL_CALL getLanguageCountryInfo( const css::lang::Locale& rLocale ) override;
-    virtual LocaleDataItem SAL_CALL getLocaleItem( const css::lang::Locale& rLocale ) override;
-    virtual css::uno::Sequence< Calendar2 > SAL_CALL getAllCalendars2( const css::lang::Locale& rLocale ) override;
-    virtual css::uno::Sequence< Calendar > SAL_CALL getAllCalendars( const css::lang::Locale& rLocale ) override;
-    virtual css::uno::Sequence< Currency > SAL_CALL getAllCurrencies( const css::lang::Locale& rLocale ) override;
-    virtual css::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const css::lang::Locale& rLocale ) override;
-    virtual css::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const css::lang::Locale& rLocale ) override;
-    virtual css::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const css::lang::Locale& rLocale ) override;
+    virtual css::i18n::LanguageCountryInfo SAL_CALL getLanguageCountryInfo( const css::lang::Locale& rLocale ) override;
+    virtual css::i18n::LocaleDataItem SAL_CALL getLocaleItem( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< css::i18n::Calendar2 > SAL_CALL getAllCalendars2( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< css::i18n::Calendar > SAL_CALL getAllCalendars( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< css::i18n::Currency > SAL_CALL getAllCurrencies( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< css::i18n::Currency2 > SAL_CALL getAllCurrencies2( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< css::i18n::FormatElement > SAL_CALL getAllFormats( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< css::i18n::Implementation > SAL_CALL getCollatorImplementations( const css::lang::Locale& rLocale ) override;
     /// @throws css::uno::RuntimeException
     OUString SAL_CALL getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
     virtual css::uno::Sequence< OUString > SAL_CALL getTransliterations( const css::lang::Locale& rLocale ) override;
-    virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) override;
+    virtual css::i18n::ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getReservedWord( const css::lang::Locale& rLocale ) override ;
     /// @throws css::uno::RuntimeException
     css::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const css::lang::Locale& rLocale ) ;
@@ -101,9 +101,9 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getCollationOptions( const css::lang::Locale& rLocale ) override;
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale );
+    css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale );
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale );
+    css::uno::Sequence< css::uno::Reference< css::container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale );
 
     // XLocaleData4
     virtual css::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const css::lang::Locale& rLocale ) override;
@@ -118,7 +118,7 @@ public:
     /// @throws css::uno::RuntimeException
     OUString SAL_CALL getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale );
+    css::uno::Sequence< css::i18n::UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale );
     /// @throws css::uno::RuntimeException
     css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale );
     /// @throws css::uno::RuntimeException
@@ -162,7 +162,7 @@ private:
 
 };
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX
 
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index b162c284bb0c..0fe10c4218d1 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 //      ----------------------------------------------------
 //      class NativeNumberSupplierService
@@ -71,7 +71,7 @@ private:
         bool useOffset;
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/numtochar.hxx b/i18npool/inc/numtochar.hxx
index f7dbd9207743..f53a5af713f8 100644
--- a/i18npool/inc/numtochar.hxx
+++ b/i18npool/inc/numtochar.hxx
@@ -22,7 +22,7 @@
 
 #include <transliteration_Numeric.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define TRANSLITERATION_NUMTOCHAR( name ) \
 class NumToChar##name : public transliteration_Numeric \
@@ -49,7 +49,7 @@ TRANSLITERATION_NUMTOCHAR(Halfwidth)
 
 #undef TRANSLITERATION_NUMTOCHAR
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_NUMTOCHAR_HXX
 
diff --git a/i18npool/inc/numtotext_cjk.hxx b/i18npool/inc/numtotext_cjk.hxx
index 56aeebed4aac..dc4918adc32e 100644
--- a/i18npool/inc/numtotext_cjk.hxx
+++ b/i18npool/inc/numtotext_cjk.hxx
@@ -22,7 +22,7 @@
 
 #include <transliteration_Numeric.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define TRANSLITERATION_NUMTOTEXT_CJK( name ) \
 class NumToText##name : public transliteration_Numeric \
@@ -64,7 +64,7 @@ TRANSLITERATION_NUMTOTEXT_CJK ( HangulCircledSyllable_ko )
 
 #undef TRANSLITERATION_NUMTOTEXT
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_NUMTOTEXT_CJK_HXX
 
diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index a7758911c375..61dd4128a59f 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -25,12 +25,11 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
-
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class OrdinalSuffixService : public cppu::WeakImplHelper
 <
-    XOrdinalSuffix,
+    css::i18n::XOrdinalSuffix,
     css::lang::XServiceInfo
 >
 {
@@ -47,7 +46,8 @@ class OrdinalSuffixService : public cppu::WeakImplHelper
         virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
-} } } }
+
+}
 
 #endif // INCLUDED_I18NPOOL_INC_ORDINALSUFFIX_HXX
 
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index fd880bc6e8d3..1a794fe7bbf6 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.hxx
@@ -22,7 +22,7 @@
 #include <transliteration_Ignore.hxx>
 #include <indexentrysupplier_asian.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class TextToPronounce_zh : public transliteration_Ignore
 {
@@ -68,7 +68,7 @@ TRANSLITERATION_TextToPronounce_zh( TextToChuyin_zh_TW)
 
 #undef TRANSLITERATION_TextToPronounce_zh
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index cca19aec5ca3..8b5c9fa9a20e 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -28,7 +28,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <osl/module.h>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class TextConversionService
@@ -159,10 +159,7 @@ private:
         css::lang::Locale aLocale;
 };
 
-} // i18n
-} // star
-} // sun
-} // com
+} // i18npool
 
 #endif
 
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index b34429d6c253..43642ef97452 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 //  class TextConversion
@@ -72,10 +72,7 @@ private:
     void SAL_CALL getLocaleSpecificTextConversion( const css::lang::Locale& rLocale );
 };
 
-} // i18n
-} // star
-} // sun
-} // com
+} // i18npool
 
 
 #endif
diff --git a/i18npool/inc/texttonum.hxx b/i18npool/inc/texttonum.hxx
index ab570ec0b67e..b4980fdea848 100644
--- a/i18npool/inc/texttonum.hxx
+++ b/i18npool/inc/texttonum.hxx
@@ -22,7 +22,7 @@
 
 #include <transliteration_Numeric.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define TRANSLITERATION_TEXTTONUM( name ) \
 class TextToNum##name : public transliteration_Numeric \
@@ -46,7 +46,7 @@ TRANSLITERATION_TEXTTONUM(KanjiLongTraditional_ja_JP)
 
 #undef TRANSLITERATION_TEXTTONUM
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_TEXTTONUM_HXX
 
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index 35c048efc951..c5e83b254885 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class TransliterationImpl : public cppu::WeakImplHelper
 <
@@ -44,8 +44,8 @@ public:
     virtual OUString SAL_CALL getName(  ) override ;
     virtual sal_Int16 SAL_CALL getType(  ) override ;
 
-    virtual void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) override ;
-    virtual void SAL_CALL loadModuleNew( const css::uno::Sequence< TransliterationModulesNew >& modName,
+    virtual void SAL_CALL loadModule( css::i18n::TransliterationModules modName, const css::lang::Locale& rLocale ) override ;
+    virtual void SAL_CALL loadModuleNew( const css::uno::Sequence< css::i18n::TransliterationModulesNew >& modName,
         const css::lang::Locale& rLocale ) override ;
     virtual void SAL_CALL loadModuleByImplName( const OUString& implName,
         const css::lang::Locale& rLocale ) override;
@@ -87,7 +87,7 @@ private:
     sal_Int16 numCascade;
     bool caseignoreOnly;
     css::uno::Reference< css::uno::XComponentContext > mxContext;
-    css::uno::Reference< XLocaleData4 > mxLocaledata;
+    css::uno::Reference< css::i18n::XLocaleData4 > mxLocaledata;
     css::uno::Reference< css::i18n::XExtendedTransliteration > caseignore;
 
     /// @throws css::uno::RuntimeException
@@ -106,7 +106,7 @@ private:
         sal_Int32 length, const sal_Int16 _nCascade);
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index 28929c746c06..b7179abae810 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -25,7 +25,7 @@
 
 typedef sal_Unicode (*TransFunc)(const sal_Unicode);
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class transliteration_Ignore : public transliteration_commonclass
 {
@@ -65,7 +65,7 @@ public:
 
 protected:
         TransFunc func;
-        oneToOneMapping *table;
+        i18nutil::oneToOneMapping *table;
         const Mapping *map;
 };
 
@@ -151,7 +151,7 @@ TRANSLITERATION_IGNORE(Size_ja_JP)
 
 #undef TRANSLITERATION_IGNORE
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_IGNORE_HXX
 
diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx
index d8ae49cb3a7c..0a88f1c39d52 100644
--- a/i18npool/inc/transliteration_Numeric.hxx
+++ b/i18npool/inc/transliteration_Numeric.hxx
@@ -21,7 +21,7 @@
 
 #include <transliteration_commonclass.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class transliteration_Numeric : public transliteration_commonclass {
 public:
@@ -54,7 +54,7 @@ private:
                              css::uno::Sequence< sal_Int32 >& offset );
 };
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_NUMERIC_HXX
 
diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx
index dce55fb6ef8d..db797be4fe7d 100644
--- a/i18npool/inc/transliteration_OneToOne.hxx
+++ b/i18npool/inc/transliteration_OneToOne.hxx
@@ -22,7 +22,7 @@
 #include <transliteration_commonclass.hxx>
 #include <i18nutil/oneToOneMapping.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 typedef sal_Unicode (*TransFunc)(const sal_Unicode);
 
@@ -50,7 +50,7 @@ public:
 
 protected:
         TransFunc func;
-        oneToOneMapping *table;
+        i18nutil::oneToOneMapping *table;
 };
 
 #define TRANSLITERATION_ONETOONE( name ) \
@@ -108,7 +108,7 @@ TRANSLITERATION_ONETOONE(smallToLarge_ja_JP)
 
 #undef TRANSLITERATION_ONETOONE
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_ONETOONE_HXX
 
diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx
index c39ff58db308..851d7cf65ebf 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.hxx
@@ -22,7 +22,7 @@
 #include <transliteration_commonclass.hxx>
 #include <i18nutil/casefolding.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class Transliteration_body : public transliteration_commonclass
 {
@@ -96,7 +96,7 @@ public:
     virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  ) override;
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx
index dff9a94b7f63..4c028f40b528 100644
--- a/i18npool/inc/transliteration_caseignore.hxx
+++ b/i18npool/inc/transliteration_caseignore.hxx
@@ -21,7 +21,7 @@
 
 #include "transliteration_body.hxx"
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class Transliteration_caseignore: public Transliteration_body
 {
@@ -31,7 +31,7 @@ public:
     // Methods which are shared.
     sal_Int16 SAL_CALL getType() override;
 
-    void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) override;
+    void SAL_CALL loadModule( css::i18n::TransliterationModules modName, const css::lang::Locale& rLocale ) override;
 
     css::uno::Sequence< OUString > SAL_CALL transliterateRange(
         const OUString& str1, const OUString& str2 ) override;
@@ -57,7 +57,7 @@ private:
         const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2);
 };
 
-} } } }
+}
 
 #endif
 
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index 0a6249b33714..ebf3dc4b60a4 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustrbuf.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 class transliteration_commonclass : public cppu::WeakImplHelper<
                                                                   css::i18n::XExtendedTransliteration,
@@ -38,10 +38,10 @@ public:
 
         // Methods which are shared.
         void SAL_CALL
-        loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) override;
+        loadModule( css::i18n::TransliterationModules modName, const css::lang::Locale& rLocale ) override;
 
         void SAL_CALL
-        loadModuleNew( const css::uno::Sequence< TransliterationModulesNew >& modName, const css::lang::Locale& rLocale ) override;
+        loadModuleNew( const css::uno::Sequence< css::i18n::TransliterationModulesNew >& modName, const css::lang::Locale& rLocale ) override;
 
         void SAL_CALL
         loadModuleByImplName( const OUString& implName, const css::lang::Locale& rLocale ) override;
@@ -94,7 +94,7 @@ protected:
         bool useOffset;
 };
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_COMMONCLASS_HXX
 
diff --git a/i18npool/inc/wtt.h b/i18npool/inc/wtt.h
index d09c3d03a5e9..2e248f04b75b 100644
--- a/i18npool/inc/wtt.h
+++ b/i18npool/inc/wtt.h
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_I18NPOOL_INC_WTT_H
 #define INCLUDED_I18NPOOL_INC_WTT_H
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 /*
  * Thai character type definition.
@@ -61,7 +61,7 @@ static const sal_uInt16 thaiCT[128] = {     // Thai character type
 
 #define getCharType(x) ((x >= 0x0E00 && x < 0x0E60) ? thaiCT[x - 0x0E00] : CT_NON)
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_INC_WTT_H
 
diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 552117ebe980..ef279ae051b5 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/i18n/Boundary.hpp>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define CACHE_MAX 32        // max cache structure number
 #define DEFAULT_SIZE 256    // for boundary size, to avoid alloc and release memory
@@ -37,7 +37,7 @@ struct WordBreakCache {
     sal_Int32 size;         // size of wordboundary
 
     WordBreakCache();
-    bool equals(const sal_Unicode *str, Boundary const & boundary);    // checking cached string
+    bool equals(const sal_Unicode *str, css::i18n::Boundary const & boundary);    // checking cached string
 };
 
 struct xdictionarydata
@@ -63,29 +63,29 @@ private:
     xdictionarydata data;
     void initDictionaryData(const sal_Char *lang);
 
-    Boundary boundary;
+    css::i18n::Boundary boundary;
     bool japaneseWordBreak;
 
 public:
     xdictionary(const sal_Char *lang);
     ~xdictionary();
-    Boundary nextWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
-    Boundary previousWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
-    Boundary const & getWordBoundary( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType, bool bDirection );
+    css::i18n::Boundary nextWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
+    css::i18n::Boundary previousWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
+    css::i18n::Boundary const & getWordBoundary( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType, bool bDirection );
     void setJapaneseWordBreak();
 
 private:
     WordBreakCache cache[CACHE_MAX];
     OUString segmentCachedString;
-    Boundary segmentCachedBoundary;
+    css::i18n::Boundary segmentCachedBoundary;
 
-    bool        seekSegment(const OUString& rText, sal_Int32 pos, Boundary& boundary);
-    WordBreakCache& getCache(const sal_Unicode *text, Boundary const & boundary);
+    bool        seekSegment(const OUString& rText, sal_Int32 pos, css::i18n::Boundary& boundary);
+    WordBreakCache& getCache(const sal_Unicode *text, css::i18n::Boundary const & boundary);
     bool        exists(const sal_uInt32 u);
-    sal_Int32       getLongestMatch(const sal_Unicode *text, sal_Int32 len);
+    sal_Int32   getLongestMatch(const sal_Unicode *text, sal_Int32 len);
 };
 
-} } } }
+}
 
 #endif