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>

38 files changed, 126 insertions, 117 deletions

diff --git a/i18npool/source/transliteration/chartonum.cxx b/i18npool/source/transliteration/chartonum.cxx
index f719d82d457e..80fae61928bf 100644
--- a/i18npool/source/transliteration/chartonum.cxx
+++ b/i18npool/source/transliteration/chartonum.cxx
@@ -23,7 +23,7 @@
 
 using namespace com::sun::star::uno;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define TRANSLITERATION_CHARTONUM( name ) \
 CharToNum##name::CharToNum##name() \
@@ -50,6 +50,6 @@ TRANSLITERATION_CHARTONUM( _th)
 
 #undef TRANSLITERATION_CHARTONUM
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
index cc90fd84e3ec..267ec26a0b60 100644
--- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
+++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
@@ -25,14 +25,15 @@
 #include <transliteration_OneToOne.hxx>
 
 using namespace com::sun::star::uno;
+using namespace com::sun::star::i18n;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 fullwidthToHalfwidth::fullwidthToHalfwidth()
 {
     func = nullptr;
-    table = &widthfolding::getfull2halfTable();
+    table = &i18nutil::widthfolding::getfull2halfTable();
     transliterationName = "fullwidthToHalfwidth";
     implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH";
 }
@@ -46,7 +47,7 @@ OUString SAL_CALL
 fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
 {
     // Decomposition: GA --> KA + voice-mark
-    const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
+    const OUString& newStr = i18nutil::widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
 
     // One to One mapping
     useOffset = false;
@@ -58,7 +59,7 @@ fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos,
 sal_Unicode SAL_CALL
 fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar)
 {
-    sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
+    sal_Unicode newChar = i18nutil::widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
     if (newChar == 0xFFFF)
         throw MultipleCharsOutputException();
     return transliteration_OneToOne::transliterateChar2Char(inChar);
@@ -67,7 +68,7 @@ fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar)
 fullwidthKatakanaToHalfwidthKatakana::fullwidthKatakanaToHalfwidthKatakana()
 {
     func = nullptr;
-    table = &widthfolding::getfullKana2halfKanaTable();
+    table = &i18nutil::widthfolding::getfullKana2halfKanaTable();
     transliterationName = "fullwidthKatakanaToHalfwidthKatakana";
     implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTHKATAKANA_HALFWIDTHKATAKANA";
 }
@@ -79,7 +80,7 @@ OUString SAL_CALL
 fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
 {
     // Decomposition: GA --> KA + voice-mark
-    const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
+    const OUString& newStr = i18nutil::widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
 
     // One to One mapping
     useOffset = false;
@@ -91,7 +92,7 @@ fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_
 sal_Unicode SAL_CALL
 fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar )
 {
-    sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
+    sal_Unicode newChar = i18nutil::widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
     if (newChar == 0xFFFF)
         throw MultipleCharsOutputException();
     return transliteration_OneToOne::transliterateChar2Char(inChar);
@@ -100,7 +101,7 @@ fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar
 fullwidthToHalfwidthLikeASC::fullwidthToHalfwidthLikeASC()
 {
     func = nullptr;
-    table = &widthfolding::getfull2halfTableForASC();
+    table = &i18nutil::widthfolding::getfull2halfTableForASC();
     transliterationName = "fullwidthToHalfwidthLikeASC";
     implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH_LIKE_ASC";
 }
@@ -112,7 +113,7 @@ OUString SAL_CALL
 fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
 {
     // Decomposition: GA --> KA + voice-mark
-    const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
+    const OUString& newStr = i18nutil::widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
 
     // One to One mapping
     useOffset = false;
@@ -125,12 +126,12 @@ fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 sta
 sal_Unicode SAL_CALL
 fullwidthToHalfwidthLikeASC::transliterateChar2Char( sal_Unicode inChar )
 {
-    sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
+    sal_Unicode newChar = i18nutil::widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
     if (newChar == 0xFFFF)
         throw MultipleCharsOutputException();
     return transliteration_OneToOne::transliterateChar2Char(inChar);
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx
index c6aff7aa4870..14b23ee95707 100644
--- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx
+++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx
@@ -25,12 +25,12 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 halfwidthToFullwidth::halfwidthToFullwidth()
 {
     func = nullptr;
-    table = &widthfolding::gethalf2fullTable();
+    table = &i18nutil::widthfolding::gethalf2fullTable();
     transliterationName = "halfwidthToFullwidth";
     implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH";
 }
@@ -45,13 +45,13 @@ halfwidthToFullwidth::transliterate( const OUString& inStr, sal_Int32 startPos,
     useOffset = _useOffset;
 
     // Composition: KA + voice-mark --> GA
-    return widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset );
+    return i18nutil::widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset );
 }
 
 halfwidthKatakanaToFullwidthKatakana::halfwidthKatakanaToFullwidthKatakana()
 {
     func = nullptr;
-    table = &widthfolding::gethalfKana2fullKanaTable();
+    table = &i18nutil::widthfolding::gethalfKana2fullKanaTable();
     transliterationName = "halfwidthKatakanaToFullwidthKatakana";
     implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTHKATAKANA_FULLWIDTHKATAKANA";
 }
@@ -66,13 +66,13 @@ halfwidthKatakanaToFullwidthKatakana::transliterate( const OUString& inStr, sal_
     useOffset = _useOffset;
 
     // Composition: KA + voice-mark --> GA
-    return widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset );
+    return i18nutil::widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset );
 }
 
 halfwidthToFullwidthLikeJIS::halfwidthToFullwidthLikeJIS()
 {
     func = nullptr;
-    table = &widthfolding::gethalf2fullTableForJIS();
+    table = &i18nutil::widthfolding::gethalf2fullTableForJIS();
     transliterationName = "halfwidthToFullwidthLikeJIS";
     implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH_LIKE_JIS";
 }
@@ -87,10 +87,10 @@ halfwidthToFullwidthLikeJIS::transliterate( const OUString& inStr, sal_Int32 sta
     useOffset = _useOffset;
 
     // Composition: KA + voice-mark --> GA
-    return widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset, WIDTHFOLDNIG_DONT_USE_COMBINED_VU );
+    return i18nutil::widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset, WIDTHFOLDNIG_DONT_USE_COMBINED_VU );
 }
 
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/hiraganaToKatakana.cxx b/i18npool/source/transliteration/hiraganaToKatakana.cxx
index 9cbc41c45a75..439ec58365e2 100644
--- a/i18npool/source/transliteration/hiraganaToKatakana.cxx
+++ b/i18npool/source/transliteration/hiraganaToKatakana.cxx
@@ -22,7 +22,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 // see http://charts.unicode.org/Web/U3040.html Hiragana (U+3040..U+309F)
 // see http://charts.unicode.org/Web/U30A0.html Katakana (U+30A0..U+30FF)
@@ -42,6 +42,6 @@ hiraganaToKatakana::hiraganaToKatakana()
     implementationName = "com.sun.star.i18n.Transliteration.HIRAGANA_KATAKANA";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
index 4fd6462f68e6..44646ac14f97 100644
--- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
@@ -21,7 +21,7 @@
 
 using namespace com::sun::star::uno;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 static const transliteration_Ignore::Mapping BaFa[] = {
     { 0x30F4, 0x30A1, 0x30D0, true },
@@ -40,6 +40,6 @@ ignoreBaFa_ja_JP::ignoreBaFa_ja_JP()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreBaFa_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
index 90142c32c2fc..0ddfe645abaa 100644
--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
+++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
@@ -12,7 +12,7 @@
 #include <unicode/translit.h>
 #include <unicode/uchar.h>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 ignoreDiacritics_CTL::ignoreDiacritics_CTL()
 {
@@ -93,6 +93,6 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr, sal_Int32 nStartPos,
     }
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
index 46ccb91982e1..c4b58821ca13 100644
--- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
@@ -22,7 +22,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 static const transliteration_Ignore::Mapping HyuByu[] = {
     { 0x30D5, 0x30E5, 0x30D2, false },
@@ -41,6 +41,6 @@ ignoreHyuByu_ja_JP::ignoreHyuByu_ja_JP()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreHyuByu_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
index ac7630c3facf..c23555a0b2b0 100644
--- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
@@ -24,9 +24,9 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
-OneToOneMappingTable_t const IandE[] = {
+i18nutil::OneToOneMappingTable_t const IandE[] = {
     { 0x30A3, 0x0000 },  // KATAKANA LETTER SMALL I
     { 0x30A4, 0x0000 },  // KATAKANA LETTER I
     { 0x30A7, 0x0000 },  // KATAKANA LETTER SMALL E
@@ -86,7 +86,7 @@ ignoreIandEfollowedByYa_ja_JP::folding( const OUString& inStr, sal_Int32 startPo
     sal_Unicode currentChar;
 
     // One to one mapping
-    oneToOneMapping aTable(IandE, sizeof(IandE));
+    i18nutil::oneToOneMapping aTable(IandE, sizeof(IandE));
 
     // Translation
     while (-- nCount > 0) {
@@ -128,6 +128,6 @@ ignoreIandEfollowedByYa_ja_JP::folding( const OUString& inStr, sal_Int32 startPo
     return OUString(newStr, SAL_NO_ACQUIRE); // take ownership
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
index 9935d53590e4..5777b9fc6f2b 100644
--- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
@@ -25,9 +25,9 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
-OneToOneMappingTable_t const ignoreIterationMark_ja_JP_mappingTable[] = {
+i18nutil::OneToOneMappingTable_t const ignoreIterationMark_ja_JP_mappingTable[] = {
     { 0x3046, 0x3094 },  // HIRAGANA LETTER U --> HIRAGANA LETTER VU
     { 0x304B, 0x304C },  // HIRAGANA LETTER KA --> HIRAGANA LETTER GA
     { 0x304D, 0x304E },  // HIRAGANA LETTER KI --> HIRAGANA LETTER GI
@@ -82,7 +82,7 @@ OneToOneMappingTable_t const ignoreIterationMark_ja_JP_mappingTable[] = {
 OUString SAL_CALL
 ignoreIterationMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
 {
-    oneToOneMapping aTable(ignoreIterationMark_ja_JP_mappingTable, sizeof(ignoreIterationMark_ja_JP_mappingTable));
+    i18nutil::oneToOneMapping aTable(ignoreIterationMark_ja_JP_mappingTable, sizeof(ignoreIterationMark_ja_JP_mappingTable));
 
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 1 now.
@@ -139,6 +139,6 @@ ignoreIterationMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, s
 
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx
index f73ebadabb61..2217aed56b09 100644
--- a/i18npool/source/transliteration/ignoreKana.cxx
+++ b/i18npool/source/transliteration/ignoreKana.cxx
@@ -26,7 +26,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 OUString SAL_CALL
 ignoreKana::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
@@ -51,14 +51,14 @@ ignoreKana::transliterateChar2Char( sal_Unicode inChar)
     return t1->transliterateChar2Char(inChar);
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_Transliteration_IGNORE_KANA_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::ignoreKana());
+    return cppu::acquire(new i18npool::ignoreKana());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreKashida_CTL.cxx b/i18npool/source/transliteration/ignoreKashida_CTL.cxx
index cd225bdaa8b6..20b6c0f858da 100644
--- a/i18npool/source/transliteration/ignoreKashida_CTL.cxx
+++ b/i18npool/source/transliteration/ignoreKashida_CTL.cxx
@@ -9,7 +9,7 @@
 
 #include <transliteration_Ignore.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 sal_Unicode
 ignoreKashida_CTL_translator (const sal_Unicode c)
@@ -29,6 +29,6 @@ ignoreKashida_CTL::ignoreKashida_CTL()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreKashida_CTL";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
index f057876a7dd9..9750b522f7a7 100644
--- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
@@ -22,7 +22,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 OUString SAL_CALL
 ignoreKiKuFollowedBySa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
@@ -86,6 +86,6 @@ ignoreKiKuFollowedBySa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos
     return OUString(newStr, SAL_NO_ACQUIRE); // take ownership
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
index aa5bbafffb87..eb7af6ef5779 100644
--- a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
@@ -19,7 +19,7 @@
 
 #include <transliteration_Ignore.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 sal_Unicode
 ignoreMiddleDot_ja_JP_translator (const sal_Unicode c)
@@ -42,6 +42,6 @@ ignoreMiddleDot_ja_JP::ignoreMiddleDot_ja_JP()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreMiddleDot_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
index 4b672b4ec73c..823d43ac4cc0 100644
--- a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
@@ -19,7 +19,7 @@
 
 #include <transliteration_Ignore.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 sal_Unicode
 ignoreMinusSign_ja_JP_translator (const sal_Unicode c)
@@ -49,6 +49,6 @@ ignoreMinusSign_ja_JP::ignoreMinusSign_ja_JP()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreMinusSign_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
index 7c37be6e36bc..932934b81c40 100644
--- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
@@ -22,7 +22,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 static const sal_Unicode table_normalwidth[] = {
     //  0x0000,   // 0x3040
@@ -345,6 +345,6 @@ ignoreProlongedSoundMark_ja_JP::folding( const OUString& inStr, sal_Int32 startP
 
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
index bb9fa2964d2a..b24a635df504 100644
--- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
@@ -22,7 +22,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 static const transliteration_Ignore::Mapping SeZe[] = {
     // SI + E --> SE
@@ -46,6 +46,6 @@ ignoreSeZe_ja_JP::ignoreSeZe_ja_JP()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreSeZe_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
index 99e423c2de42..8f1555608034 100644
--- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
@@ -19,9 +19,9 @@
 
 #include <transliteration_Ignore.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
-OneToOneMappingTable_t const ignoreSeparatorTable[] = {
+i18nutil::OneToOneMappingTable_t const ignoreSeparatorTable[] = {
     { 0x0021, 0xFFFF },  // EXCLAMATION MARK
     { 0x0023, 0xFFFF },  // NUMBER SIGN
     { 0x0024, 0xFFFF },  // DOLLAR SIGN
@@ -99,7 +99,7 @@ OneToOneMappingTable_t const ignoreSeparatorTable[] = {
 
 ignoreSeparator_ja_JP::ignoreSeparator_ja_JP()
 {
-    static oneToOneMapping _table(ignoreSeparatorTable, sizeof(ignoreSeparatorTable));
+    static i18nutil::oneToOneMapping _table(ignoreSeparatorTable, sizeof(ignoreSeparatorTable));
     func = nullptr;
     table = &_table;
     map = nullptr;
@@ -107,6 +107,6 @@ ignoreSeparator_ja_JP::ignoreSeparator_ja_JP()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreSeparator_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
index b463a2ae7c64..420bcdcfd47f 100644
--- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
@@ -24,7 +24,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 OUString SAL_CALL
 ignoreSize_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
@@ -50,6 +50,6 @@ ignoreSize_ja_JP::transliterateChar2Char( sal_Unicode inChar)
     return t1->transliterateChar2Char(inChar);
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
index dbee15105cbc..f90021eb5daf 100644
--- a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
@@ -19,9 +19,9 @@
 
 #include <transliteration_Ignore.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
-OneToOneMappingTable_t const ignoreSpace_ja_JP_mappingTable[] = {
+i18nutil::OneToOneMappingTable_t const ignoreSpace_ja_JP_mappingTable[] = {
     { 0x0020, 0xffff },  // SPACE
     { 0x00A0, 0xffff },  // NO-BREAK SPACE
     { 0x2002, 0xffff },  // EN SPACE
@@ -43,12 +43,12 @@ OneToOneMappingTable_t const ignoreSpace_ja_JP_mappingTable[] = {
 ignoreSpace_ja_JP::ignoreSpace_ja_JP()
 {
     func = nullptr;
-    table = new oneToOneMapping(ignoreSpace_ja_JP_mappingTable, sizeof(ignoreSpace_ja_JP_mappingTable));
+    table = new i18nutil::oneToOneMapping(ignoreSpace_ja_JP_mappingTable, sizeof(ignoreSpace_ja_JP_mappingTable));
     map = nullptr;
     transliterationName = "ignoreSpace_ja_JP";
     implementationName = "com.sun.star.i18n.Transliteration.ignoreSpace_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
index 3e8f259e449e..42c1aee7c0e9 100644
--- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
@@ -22,7 +22,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 static const transliteration_Ignore::Mapping TiJi[] = {
     // TU + I --> TI
@@ -50,6 +50,6 @@ ignoreTiJi_ja_JP::ignoreTiJi_ja_JP()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreTiJi_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
index 8c093c037910..b62d79440024 100644
--- a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
@@ -19,7 +19,7 @@
 
 #include <transliteration_Ignore.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 sal_Unicode
 ignoreTraditionalKana_ja_JP_translator (const sal_Unicode c)
@@ -50,6 +50,6 @@ ignoreTraditionalKana_ja_JP::ignoreTraditionalKana_ja_JP()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreTraditionalKana_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
index 1606c90bafa3..7b6b01f8f578 100644
--- a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
@@ -19,10 +19,10 @@
 
 #include <transliteration_Ignore.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 // traditional Kanji characters --> modern Kanji characters
-OneToOneMappingTable_t const traditionalKanji2updateKanji[] = {
+i18nutil::OneToOneMappingTable_t const traditionalKanji2updateKanji[] = {
     { 0x4E17, 0x4E16 },
     { 0x4E55, 0x864E },
     { 0x4E58, 0x4E57 },
@@ -721,7 +721,7 @@ OneToOneMappingTable_t const traditionalKanji2updateKanji[] = {
 
 ignoreTraditionalKanji_ja_JP::ignoreTraditionalKanji_ja_JP()
 {
-    static oneToOneMapping _table(traditionalKanji2updateKanji, sizeof(traditionalKanji2updateKanji));
+    static i18nutil::oneToOneMapping _table(traditionalKanji2updateKanji, sizeof(traditionalKanji2updateKanji));
     func = nullptr;
     table = &_table;
     map = nullptr;
@@ -729,6 +729,6 @@ ignoreTraditionalKanji_ja_JP::ignoreTraditionalKanji_ja_JP()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreTraditionalKanji_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx
index 813f043f2050..c2a6f756d3dc 100644
--- a/i18npool/source/transliteration/ignoreWidth.cxx
+++ b/i18npool/source/transliteration/ignoreWidth.cxx
@@ -26,7 +26,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 OUString SAL_CALL
 ignoreWidth::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
@@ -51,14 +51,14 @@ ignoreWidth::transliterateChar2Char( sal_Unicode inChar)
     return t1->transliterateChar2Char(inChar);
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_Transliteration_IGNORE_WIDTH_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::ignoreWidth());
+    return cppu::acquire(new i18npool::ignoreWidth());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
index 180644e90fe9..3591078eaaec 100644
--- a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
@@ -19,7 +19,7 @@
 
 #include <transliteration_Ignore.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 sal_Unicode
 ignoreZiZu_ja_JP_translator (const sal_Unicode c)
@@ -50,6 +50,6 @@ ignoreZiZu_ja_JP::ignoreZiZu_ja_JP()
     implementationName = "com.sun.star.i18n.Transliteration.ignoreZiZu_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/katakanaToHiragana.cxx b/i18npool/source/transliteration/katakanaToHiragana.cxx
index 9e4ac155e2f5..7b5f5921f5a1 100644
--- a/i18npool/source/transliteration/katakanaToHiragana.cxx
+++ b/i18npool/source/transliteration/katakanaToHiragana.cxx
@@ -19,7 +19,7 @@
 
 #include <transliteration_OneToOne.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 // see http://charts.unicode.org/Web/U3040.html Hiragana (U+3040..U+309F)
 // see http://charts.unicode.org/Web/U30A0.html Katakana (U+30A0..U+30FF)
@@ -40,6 +40,6 @@ katakanaToHiragana::katakanaToHiragana()
     implementationName = "com.sun.star.i18n.Transliteration.KATAKANA_HIRAGANA";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx
index 3986336e2746..198100a1f9b8 100644
--- a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx
+++ b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx
@@ -24,7 +24,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 // ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.txt
 // ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.html
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 // http://charts.unicode.org/Web/U30A0.html Katakana (U+30A0..U+30FF)
 // http://charts.unicode.org/Web/UFF00.html
 
-OneToOneMappingTable_t const large2small[] = {
+i18nutil::OneToOneMappingTable_t const large2small[] = {
     { 0x3041, 0x3042 },  // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A
     { 0x3043, 0x3044 },  // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I
     { 0x3045, 0x3046 },  // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U
@@ -68,13 +68,13 @@ OneToOneMappingTable_t const large2small[] = {
 
 largeToSmall_ja_JP::largeToSmall_ja_JP()
 {
-    static oneToOneMapping _table(large2small, sizeof(large2small));
+    static i18nutil::oneToOneMapping _table(large2small, sizeof(large2small));
     func = nullptr;
     table = &_table;
     transliterationName = "largeToSmall_ja_JP";
     implementationName = "com.sun.star.i18n.Transliteration.largeToSmall_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/numtochar.cxx b/i18npool/source/transliteration/numtochar.cxx
index ccdcd74dd949..56761f44ca77 100644
--- a/i18npool/source/transliteration/numtochar.cxx
+++ b/i18npool/source/transliteration/numtochar.cxx
@@ -21,7 +21,7 @@
 
 #include <numtochar.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define TRANSLITERATION_NUMTOCHAR( name, number ) \
 NumToChar##name::NumToChar##name() \
@@ -52,6 +52,6 @@ TRANSLITERATION_NUMTOCHAR( _th, NATNUM1 )
 
 #undef TRANSLITERATION_NUMTOCHAR
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/numtotext_cjk.cxx b/i18npool/source/transliteration/numtotext_cjk.cxx
index af633d0c1997..f60561f2131f 100644
--- a/i18npool/source/transliteration/numtotext_cjk.cxx
+++ b/i18npool/source/transliteration/numtotext_cjk.cxx
@@ -22,7 +22,7 @@
 #include <numtotext_cjk.hxx>
 #include <bullet.h>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define TRANSLITERATION_NUMTOTEXT( name, number ) \
 NumToText##name::NumToText##name() \
@@ -80,6 +80,6 @@ TRANSLITERATION_NUMTOTEXT ( HangulCircledSyllable_ko, table_HangulCircledSyllabl
 
 #undef TRANSLITERATION_NUMTOTEXT
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx
index fb48392df152..180db1d3a0b2 100644
--- a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx
+++ b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx
@@ -24,7 +24,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 // ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.txt
 // ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.html
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 // http://charts.unicode.org/Web/U30A0.html Katakana (U+30A0..U+30FF)
 // http://charts.unicode.org/Web/UFF00.html
 
-OneToOneMappingTable_t const small2large[] = {
+i18nutil::OneToOneMappingTable_t const small2large[] = {
     { 0x3041, 0x3042 },  // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A
     { 0x3043, 0x3044 },  // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I
     { 0x3045, 0x3046 },  // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U
@@ -68,13 +68,13 @@ OneToOneMappingTable_t const small2large[] = {
 
 smallToLarge_ja_JP::smallToLarge_ja_JP()
 {
-    static oneToOneMapping _table(small2large, sizeof(small2large));
+    static i18nutil::oneToOneMapping _table(small2large, sizeof(small2large));
     func = nullptr;
     table = &_table;
     transliterationName = "smallToLarge_ja_JP";
     implementationName = "com.sun.star.i18n.Transliteration.smallToLarge_ja_JP";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx
index a46889f4f724..be3c1f5815b1 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -25,9 +25,10 @@
 
 #include <textToPronounce_zh.hxx>
 
+using namespace com::sun::star::i18n;
 using namespace com::sun::star::uno;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 sal_Int16 SAL_CALL TextToPronounce_zh::getType()
 {
@@ -187,6 +188,6 @@ TextToPronounce_zh::~TextToPronounce_zh()
     if (hModule) osl_unloadModule(hModule);
 #endif
 }
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/texttonum.cxx b/i18npool/source/transliteration/texttonum.cxx
index 188b37460eab..5fd0e898de96 100644
--- a/i18npool/source/transliteration/texttonum.cxx
+++ b/i18npool/source/transliteration/texttonum.cxx
@@ -21,7 +21,7 @@
 
 using namespace com::sun::star::uno;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define TRANSLITERATION_TEXTTONUM( name ) \
 TextToNum##name::TextToNum##name() \
@@ -47,6 +47,6 @@ TRANSLITERATION_TEXTTONUM( KanjiLongModern_ja_JP)
 
 #undef TRANSLITERATION_TEXTTONUM
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 2f2aa8adc279..5c2c93ce9df9 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -36,10 +36,11 @@
 #include <algorithm>
 
 using namespace com::sun::star::uno;
+using namespace com::sun::star::i18n;
 using namespace com::sun::star::lang;
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define ERROR RuntimeException()
 
@@ -657,14 +658,14 @@ TransliterationImpl::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_Transliteration_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::TransliterationImpl(context));
+    return cppu::acquire(new i18npool::TransliterationImpl(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx
index dae3f42924d9..4c0a4323acbf 100644
--- a/i18npool/source/transliteration/transliteration_Ignore.cxx
+++ b/i18npool/source/transliteration/transliteration_Ignore.cxx
@@ -19,9 +19,10 @@
 
 #include <transliteration_Ignore.hxx>
 
+using namespace com::sun::star::i18n;
 using namespace com::sun::star::uno;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 inline sal_Int32 Min( sal_Int32 a, sal_Int32 b ) { return a > b ? b : a; }
 
@@ -201,6 +202,6 @@ transliteration_Ignore::transliterateChar2Char( sal_Unicode inChar)
     return func ? func( inChar) : table ? (*table)[ inChar ] : inChar;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx
index 1d32fbae7805..98d245ada181 100644
--- a/i18npool/source/transliteration/transliteration_Numeric.cxx
+++ b/i18npool/source/transliteration/transliteration_Numeric.cxx
@@ -24,10 +24,11 @@
 #include <comphelper/string.hxx>
 #include <rtl/ref.hxx>
 
+using namespace com::sun::star::i18n;
 using namespace com::sun::star::uno;
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 sal_Int16 SAL_CALL transliteration_Numeric::getType()
 {
@@ -135,6 +136,6 @@ transliteration_Numeric::transliterateChar2Char( sal_Unicode inChar )
         return rtl::Reference<NativeNumberSupplierService>(new NativeNumberSupplierService)->getNativeNumberChar( inChar, aLocale, nNativeNumberMode );
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx
index f820a35921e9..70fddaff190f 100644
--- a/i18npool/source/transliteration/transliteration_OneToOne.cxx
+++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx
@@ -19,9 +19,10 @@
 
 #include <transliteration_OneToOne.hxx>
 
+using namespace com::sun::star::i18n;
 using namespace com::sun::star::uno;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 sal_Int16 SAL_CALL transliteration_OneToOne::getType()
 {
@@ -86,6 +87,6 @@ transliteration_OneToOne::transliterateChar2Char( sal_Unicode inChar)
     return func ? func( inChar) : (*table)[ inChar ];
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx
index b26c6b524cb8..930d0c23b9f5 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -34,9 +34,10 @@
 #include <memory>
 
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 Transliteration_body::Transliteration_body()
 {
@@ -107,7 +108,7 @@ Transliteration_body::transliterate(
             if (nMappingType == (MappingType::LowerToUpper | MappingType::UpperToLower))
                 nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] );
 
-            const Mapping &map = casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType );
+            const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType );
             nOffCount += map.nmap;
         }
         rtl_uString* pStr = rtl_uString_alloc(nOffCount);
@@ -125,7 +126,7 @@ Transliteration_body::transliterate(
             if (nMappingType == (MappingType::LowerToUpper | MappingType::UpperToLower))
                 nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] );
 
-            const Mapping &map = casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType );
+            const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType );
             for (sal_Int32 k = 0; k < map.nmap; k++)
             {
                 pArr[j] = i + startPos;
@@ -165,7 +166,7 @@ Transliteration_body::transliterate(
             if (nMappingType == (MappingType::LowerToUpper | MappingType::UpperToLower))
                 nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] );
 
-            const Mapping &map = casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType );
+            const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType );
             for (sal_Int32 k = 0; k < map.nmap; k++)
             {
                 out[j++] = map.map[k];
@@ -180,7 +181,7 @@ Transliteration_body::transliterate(
 OUString SAL_CALL
 Transliteration_body::transliterateChar2String( sal_Unicode inChar )
 {
-    const Mapping &map = casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType);
+    const i18nutil::Mapping &map = i18nutil::casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType);
     rtl_uString* pStr = rtl_uString_alloc(map.nmap);
     sal_Unicode* out = pStr->buffer;
     sal_Int32 i;
@@ -195,7 +196,7 @@ Transliteration_body::transliterateChar2String( sal_Unicode inChar )
 sal_Unicode SAL_CALL
 Transliteration_body::transliterateChar2Char( sal_Unicode inChar )
 {
-    const Mapping &map = casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType);
+    const i18nutil::Mapping &map = i18nutil::casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType);
     if (map.nmap > 1)
         throw MultipleCharsOutputException();
     return map.map[0];
@@ -326,6 +327,6 @@ OUString SAL_CALL Transliteration_sentencecase::transliterate(
     return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset );
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx
index 9ac4712ba233..4bfb59b73f71 100644
--- a/i18npool/source/transliteration/transliteration_caseignore.cxx
+++ b/i18npool/source/transliteration/transliteration_caseignore.cxx
@@ -27,9 +27,10 @@
 #include "transliteration_caseignore.hxx"
 
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 Transliteration_caseignore::Transliteration_caseignore()
 {
@@ -120,15 +121,15 @@ Transliteration_caseignore::compare(
     const sal_Unicode *unistr1 = const_cast<sal_Unicode*>(str1.getStr()) + pos1;
     const sal_Unicode *unistr2 = const_cast<sal_Unicode*>(str2.getStr()) + pos2;
     sal_Unicode c1, c2;
-    MappingElement e1, e2;
+    i18nutil::MappingElement e1, e2;
     nMatch1 = nMatch2 = 0;
 
 #define NOT_END_OF_STR1 (nMatch1 < nCount1 || e1.current < e1.element.nmap)
 #define NOT_END_OF_STR2 (nMatch2 < nCount2 || e2.current < e2.element.nmap)
 
     while (NOT_END_OF_STR1 && NOT_END_OF_STR2) {
-        c1 = casefolding::getNextChar(unistr1, nMatch1, nCount1, e1, aLocale, nMappingType, moduleLoaded);
-        c2 = casefolding::getNextChar(unistr2, nMatch2, nCount2, e2, aLocale, nMappingType, moduleLoaded);
+        c1 = i18nutil::casefolding::getNextChar(unistr1, nMatch1, nCount1, e1, aLocale, nMappingType, moduleLoaded);
+        c2 = i18nutil::casefolding::getNextChar(unistr2, nMatch2, nCount2, e2, aLocale, nMappingType, moduleLoaded);
         if (c1 != c2) {
         nMatch1--; nMatch2--;
         return c1 > c2 ? 1 : -1;
@@ -139,14 +140,14 @@ Transliteration_caseignore::compare(
                 : (NOT_END_OF_STR1 ? 1 : -1);
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_Transliteration_IGNORE_CASE_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::Transliteration_caseignore());
+    return cppu::acquire(new i18npool::Transliteration_caseignore());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/transliteration_commonclass.cxx b/i18npool/source/transliteration/transliteration_commonclass.cxx
index 6f4081a1eb2f..a00a5eb1e5ed 100644
--- a/i18npool/source/transliteration/transliteration_commonclass.cxx
+++ b/i18npool/source/transliteration/transliteration_commonclass.cxx
@@ -22,9 +22,10 @@
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 transliteration_commonclass::transliteration_commonclass()
 {
@@ -136,6 +137,6 @@ Sequence< OUString > SAL_CALL transliteration_commonclass::getSupportedServiceNa
     return aRet;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */