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>
author: Noel Grandin <noel.grandin@collabora.co.uk> 2017-10-03 14:16:24 +0200
committer: Noel Grandin <noel.grandin@collabora.co.uk> 2017-10-04 08:39:11 +0200
commit: 6ce77cac03123f2bf5c9b6698a3f80e32d7fbe85 (patch)
tree: abdd40004f9a98c3be7f37e8e0027639456cd688 /i18npool/source
parent: f2db08b28e99c61c44bc057d03de926ac33d93b7 (diff)
73 files changed, 251 insertions, 213 deletions
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index fba56fcec7ae..24ca264e708b 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -24,10 +24,12 @@
 #include <i18nutil/unicode.hxx>
 #include <rtl/ustrbuf.hxx>
 
+using namespace ::com::sun::star;
 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 {
 
 BreakIteratorImpl::BreakIteratorImpl( const Reference < XComponentContext >& rxContext ) : m_xContext( rxContext )
 {
@@ -630,14 +632,14 @@ BreakIteratorImpl::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_BreakIterator_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::BreakIteratorImpl(context));
+    return cppu::acquire(new i18npool::BreakIteratorImpl(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index 5921a8774738..98115e6c1d32 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx
@@ -24,9 +24,10 @@
 #include <o3tl/make_unique.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 {
 
 //      ----------------------------------------------------
 //      class BreakIterator_CJK
@@ -39,7 +40,7 @@ BreakIterator_CJK::BreakIterator_CJK()
 
 Boundary SAL_CALL
 BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos,
-        const lang::Locale& nLocale, sal_Int16 wordType)
+        const css::lang::Locale& nLocale, sal_Int16 wordType)
 {
     if (m_xDict) {
         result = m_xDict->previousWord(text, anyPos, wordType);
@@ -56,7 +57,7 @@ BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos,
 
 Boundary SAL_CALL
 BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos,
-        const lang::Locale& nLocale, sal_Int16 wordType)
+        const css::lang::Locale& nLocale, sal_Int16 wordType)
 {
     if (m_xDict) {
         result = m_xDict->nextWord(text, anyPos, wordType);
@@ -73,7 +74,7 @@ BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos,
 
 Boundary SAL_CALL
 BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos,
-        const lang::Locale& nLocale, sal_Int16 wordType, sal_Bool bDirection )
+        const css::lang::Locale& nLocale, sal_Int16 wordType, sal_Bool bDirection )
 {
     if (m_xDict) {
         result = m_xDict->getWordBoundary(text, anyPos, wordType, bDirection);
@@ -87,7 +88,7 @@ BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos,
 
 LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak(
         const OUString& Text, sal_Int32 nStartPos,
-        const lang::Locale& /*rLocale*/, sal_Int32 /*nMinBreakPos*/,
+        const css::lang::Locale& /*rLocale*/, sal_Int32 /*nMinBreakPos*/,
         const LineBreakHyphenationOptions& /*hOptions*/,
         const LineBreakUserOptions& bOptions )
 {
@@ -109,7 +110,7 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak(
     return lbr;
 }
 
-#define LOCALE(language, country) lang::Locale(language, country, OUString())
+#define LOCALE(language, country) css::lang::Locale(language, country, OUString())
 //      ----------------------------------------------------
 //      class BreakIterator_zh
 //      ----------------------------------------------------;
@@ -150,6 +151,6 @@ BreakIterator_ko::BreakIterator_ko()
     cBreakIterator = "com.sun.star.i18n.BreakIterator_ko";
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx
index f641bc927ca1..e39966e66175 100644
--- a/i18npool/source/breakiterator/breakiterator_ctl.cxx
+++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx
@@ -21,10 +21,12 @@
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <breakiterator_ctl.hxx>
 
+using namespace ::com::sun::star;
 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 {
 
 /**
  * Constructor.
@@ -125,6 +127,6 @@ LineBreakResults SAL_CALL BreakIterator_CTL::getLineBreak(
     return lbr;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx
index b658dbdde0e1..66e2827f3ac2 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.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 {
 
 
 //  class Breakiterator_th
@@ -146,6 +146,6 @@ void SAL_CALL BreakIterator_th::makeIndex(const OUString& Text, sal_Int32 const
     }
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 3e31c3606005..bd9d09a34afc 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -35,9 +35,10 @@ extern const char OpenOffice_dat[];
 U_CDECL_END
 
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 // Cache map of breakiterators, stores state information so has to be
 // thread_local.
@@ -585,14 +586,14 @@ BreakIterator_Unicode::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_BreakIterator_Unicode_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::BreakIterator_Unicode());
+    return cppu::acquire(new i18npool::BreakIterator_Unicode());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 90e866426d57..5653021fc13a 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -29,7 +29,9 @@
 #include <string.h>
 #include <breakiteratorImpl.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+using namespace com::sun::star::i18n;
+
+namespace i18npool {
 
 #ifdef DICT_JA_ZH_IN_DATAFILE
 
@@ -198,7 +200,7 @@ bool xdictionary::exists(const sal_uInt32 c)
     // 0x1FFF is the hardcoded limit in gendict for data.existMarks
     bool exist = data.existMark && (c>>3) < 0x1FFF && (data.existMark[c>>3] & (1<<(c&0x07))) != 0;
     if (!exist && japaneseWordBreak)
-        return BreakIteratorImpl::getScriptClass(c) == ScriptType::ASIAN;
+        return BreakIteratorImpl::getScriptClass(c) == css::i18n::ScriptType::ASIAN;
     else
         return exist;
 }
@@ -474,6 +476,6 @@ Boundary const & xdictionary::getWordBoundary(const OUString& rText, sal_Int32 a
         return boundary;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index d6820155b38c..dbb95fd7489f 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -23,9 +23,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 {
 
 #define ERROR RuntimeException()
 
@@ -348,6 +349,6 @@ CalendarImpl::getSupportedServiceNames()
     return aRet;
 }
 
-}}}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index 78fd7457927c..f89f5fa046e3 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -122,10 +122,11 @@ static void debug_i18n_cal_dump( const ::icu::Calendar & r )
 
 
 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()
 
@@ -989,6 +990,6 @@ Calendar_gregorian::getSupportedServiceNames()
     return aRet;
 }
 
-}}}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx
index eeabf6d47472..ae8f78fd38a6 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.cxx
@@ -25,10 +25,11 @@
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::i18n;
 
 #define GREGORIAN_CROSSOVER 2299161
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 // not used
 //static UErrorCode status; // status is shared in all calls to Calendar, it has to be reset for each call.
@@ -327,6 +328,6 @@ Calendar_hijri::getJulianDay(sal_Int32 day, sal_Int32 month, sal_Int32 year)
     return (double) intgr;
 }
 
-}}}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx
index f9130450895e..4e05bbba9868 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -24,9 +24,10 @@
 #include "calendar_jewish.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 {
 
 // not used
 //static UErrorCode status; // status is shared in all calls to Calendar, it has to be reset for each call.
@@ -292,6 +293,6 @@ Calendar_jewish::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNa
         return Calendar_gregorian::getDisplayString(nCalendarDisplayCode, nNativeNumberMode );
 }
 
-}}}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx
index a4582897bb9a..4f7ee6cfb279 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -29,10 +29,12 @@
 #include <breakiteratorImpl.hxx>
 #include <rtl/ref.hxx>
 
+using namespace ::com::sun::star;
 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 {
 
 //  class cclass_Unicode
 //  ----------------------------------------------------;
@@ -291,14 +293,14 @@ Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_CharacterClassification_Unicode_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::cclass_Unicode(context));
+    return cppu::acquire(new i18npool::cclass_Unicode(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 2a3616302cc3..dc3d0775586d 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -33,11 +33,12 @@
 #include <string.h>
 
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
 
 #define TOKEN_DIGIT_FLAGS (ParserFlags::CHAR_VALUE | ParserFlags::VALUE | ParserFlags::VALUE_EXP | ParserFlags::VALUE_EXP_VALUE | ParserFlags::VALUE_DIGIT)
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 // Default identifier/name specification is [A-Za-z_][A-Za-z0-9_]*
 
@@ -592,7 +593,6 @@ ParserFlags cclass_Unicode::getFlagsExtended(sal_uInt32 const c)
         return ParserFlags::VALUE;
     else if ( c == cDecimalSep )
         return ParserFlags::CHAR_VALUE | ParserFlags::VALUE;
-    using namespace i18n;
     bool bStart = (eState == ssGetChar || eState == ssGetWordFirstChar ||
             eState == ssRewindFromValue || eState == ssIgnoreLeadingInRewind);
     sal_Int32 nTypes = (bStart ? nStartTypes : nContTypes);
@@ -690,7 +690,6 @@ ParserFlags cclass_Unicode::getContCharsFlags( sal_Unicode c )
 void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 nPos, sal_Int32 nTokenType )
 {
     assert(r.LeadingWhiteSpace == 0);
-    using namespace i18n;
     eState = ssGetChar;
 
     //! All the variables below (plus ParseResult) have to be resetted on ssRewindFromValue!
@@ -1035,6 +1034,6 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
     }
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index 03566456cd0c..849251e65213 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -23,12 +23,13 @@
 #include <rtl/ustrbuf.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 {
 
 CharacterClassificationImpl::CharacterClassificationImpl(
-        const Reference < uno::XComponentContext >& rxContext ) : m_xContext( rxContext )
+        const Reference < XComponentContext >& rxContext ) : m_xContext( rxContext )
 {
     if (createLocaleSpecificCharacterClassification("Unicode", Locale()))
         xUCI = cachedItem->xCI;
@@ -205,14 +206,14 @@ CharacterClassificationImpl::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_CharacterClassification_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::CharacterClassificationImpl(context));
+    return cppu::acquire(new i18npool::CharacterClassificationImpl(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index ccb4d9a3370f..1f48d61c7824 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.cxx
@@ -27,6 +27,8 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::i18n;
 
+namespace i18npool {
+
 ChapterCollator::ChapterCollator( const Reference < XComponentContext >& rxContext ) : CollatorImpl(rxContext)
 {
     cclass = CharacterClassification::create( rxContext );
@@ -91,4 +93,5 @@ ChapterCollator::getSupportedServiceNames()
     return aRet;
 }
 
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 022071a9b904..258ee9f6ec66 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -26,10 +26,11 @@
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace com::sun::star;
+using namespace com::sun::star::i18n;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 CollatorImpl::CollatorImpl( const Reference < XComponentContext >& rxContext ) : m_xContext(rxContext)
 {
@@ -225,14 +226,14 @@ CollatorImpl::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_Collator_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::CollatorImpl(context));
+    return cppu::acquire(new i18npool::CollatorImpl(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 21c7deee2860..fae276818b3c 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -30,10 +30,11 @@
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 Collator_Unicode::Collator_Unicode()
 {
@@ -406,6 +407,6 @@ Collator_Unicode::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index cd2e9fecac3a..f898d6fde3e3 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -63,9 +63,10 @@
 
 using namespace com::sun::star;
 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 {
 
 static const sal_Unicode table_Alphabet_ar[] = {
     0x0623, 0x0628, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E,
@@ -1061,14 +1062,14 @@ Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_text_DefaultNumberingProvider_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::DefaultNumberingProvider(context));
+    return cppu::acquire(new i18npool::DefaultNumberingProvider(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx
index 9b6d938c987b..d467b5b708b9 100644
--- a/i18npool/source/indexentry/indexentrysupplier.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier.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 {
 
 IndexEntrySupplier::IndexEntrySupplier( const Reference < XComponentContext >& rxContext ) : m_xContext( rxContext )
 {
@@ -190,6 +190,6 @@ IndexEntrySupplier::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index a6594c381b65..6f06eb44bed5 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -25,7 +25,7 @@
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #ifndef DISABLE_DYNLOADING
 
@@ -204,6 +204,8 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
     }
     return OUString();
 }
-} } } }
+
+}
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx
index ba7aa0fccfb4..5bc149041a40 100644
--- a/i18npool/source/indexentry/indexentrysupplier_common.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx
@@ -25,7 +25,7 @@
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 IndexEntrySupplier_Common::IndexEntrySupplier_Common(const Reference < uno::XComponentContext >& rxContext)
 {
@@ -133,6 +133,6 @@ IndexEntrySupplier_Common::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index d0673a9d50ed..cc5db18053be 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -22,10 +22,12 @@
 #include <i18nutil/unicode.hxx>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 
+using namespace ::com::sun::star;
 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 {
 
 IndexEntrySupplier_Unicode::IndexEntrySupplier_Unicode(
     const css::uno::Reference < css::uno::XComponentContext >& rxContext ) :
@@ -280,6 +282,6 @@ void Index::init(const lang::Locale &rLocale, const OUString& algorithm)
     table_count = j;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
index d9f6893ab6e0..417fa47306cd 100644
--- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
@@ -23,10 +23,12 @@
 #include <data/indexdata_ja_phonetic.h>
 #include <string.h>
 
-namespace com { namespace sun { namespace star { namespace i18n {
+using namespace ::com::sun::star::i18n;
+
+namespace i18npool {
 
 OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUString& rIndexEntry,
-    const lang::Locale& /*rLocale*/, const OUString& /*rSortAlgorithm*/ )
+    const css::lang::Locale& /*rLocale*/, const OUString& /*rSortAlgorithm*/ )
 {
     sal_Unicode ch=rIndexEntry.toChar();
     sal_uInt16 first = idx[ ch >> 8 ];
@@ -40,14 +42,14 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUStr
 }
 
 OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& IndexEntry,
-    const OUString& PhoneticEntry, const lang::Locale& rLocale )
+    const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
 {
     return getIndexCharacter( PhoneticEntry.isEmpty() ? IndexEntry : PhoneticEntry , rLocale, OUString());
 }
 
 sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry(
-    const OUString& IndexEntry1, const OUString& PhoneticEntry1, const lang::Locale& rLocale1,
-    const OUString& IndexEntry2, const OUString& PhoneticEntry2, const lang::Locale& rLocale2 )
+    const OUString& IndexEntry1, const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,
+    const OUString& IndexEntry2, const OUString& PhoneticEntry2, const css::lang::Locale& rLocale2 )
 {
     sal_Int16 result = sal::static_int_cast<sal_Int16>( collator->compareString(
         IndexEntrySupplier_ja_phonetic::getIndexKey(IndexEntry1, PhoneticEntry1, rLocale1),
@@ -88,6 +90,6 @@ sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_consonant:
     return collator->loadCollatorAlgorithm(last, rLocale, collatorOptions) == 0;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 5bb3ac320d98..24964521ae1e 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -24,9 +24,10 @@
 #include <i18nutil/unicode.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 {
 
 InputSequenceCheckerImpl::InputSequenceCheckerImpl( const Reference < XComponentContext >& rxContext ) : m_xContext( rxContext )
 {
@@ -118,13 +119,13 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char const * rLanguage)
                 return cachedItem->xISC;
         }
 
-        Reference < uno::XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
+        Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
                 "com.sun.star.i18n.InputSequenceChecker_" +
                 OUString::createFromAscii(rLanguage),
                 m_xContext);
 
         if ( xI.is() ) {
-            Reference< XExtendedInputSequenceChecker > xISC( xI, uno::UNO_QUERY );
+            Reference< XExtendedInputSequenceChecker > xISC( xI, UNO_QUERY );
             if (xISC.is()) {
                 lookupTable.push_back(cachedItem = new lookupTableItem(rLanguage, xISC));
                 return cachedItem->xISC;
@@ -153,14 +154,14 @@ InputSequenceCheckerImpl::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_InputSequenceChecker_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::InputSequenceCheckerImpl(context));
+    return cppu::acquire(new i18npool::InputSequenceCheckerImpl(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
index 52f8fae5a9bb..4e65a655ac7f 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
@@ -21,10 +21,7 @@
 #include <inputsequencechecker_hi.hxx>
 
 
-namespace com {
-namespace sun {
-namespace star {
-namespace i18n {
+namespace i18npool {
 
 InputSequenceChecker_hi::InputSequenceChecker_hi()
     : InputSequenceCheckerImpl("com.sun.star.i18n.InputSequenceChecker_hi")
@@ -132,6 +129,6 @@ InputSequenceChecker_hi::correctInputSequence(OUString& Text,
         nStartPos=Text.getLength();
     return nStartPos;
 }
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
index 660f78be0998..bc2fbe239808 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
@@ -22,7 +22,7 @@
 #include <wtt.h>
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 InputSequenceChecker_th::InputSequenceChecker_th()
     : InputSequenceCheckerImpl("com.sun.star.i18n.InputSequenceChecker_th")
@@ -139,6 +139,6 @@ http://www.openoffice.org/issues/show_bug.cgi?id=42661
     return nStartPos;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 2660f7fae5c1..9c8559046fbd 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -347,6 +347,7 @@ struct LocaleDataLookupTableItem
     }
 };
 
+namespace i18npool {
 
 // static
 Sequence< CalendarItem > LocaleDataImpl::downcastCalendarItems( const Sequence< CalendarItem2 > & rCi )
@@ -1594,12 +1595,14 @@ OUString LocaleDataImpl::getFirstLocaleServiceName( const css::lang::Locale & rL
     return aVec;
 }
 
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_LocaleDataImpl_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new LocaleDataImpl());
+    return cppu::acquire(new i18npool::LocaleDataImpl());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/nativenumber/data/numberchar.h b/i18npool/source/nativenumber/data/numberchar.h
index 18974acae080..91cd3dcae828 100644
--- a/i18npool/source/nativenumber/data/numberchar.h
+++ b/i18npool/source/nativenumber/data/numberchar.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_I18NPOOL_SOURCE_NATIVENUMBER_DATA_NUMBERCHAR_H
 #define INCLUDED_I18NPOOL_SOURCE_NATIVENUMBER_DATA_NUMBERCHAR_H
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 static const sal_Int16 NumberChar_HalfWidth     = 0;
 static const sal_Int16 NumberChar_FullWidth     = 1;
@@ -264,7 +264,7 @@ static const sal_Unicode MultiplierChar_7_CJK[][ExponentCount_7_CJK] = {
     {0x4EAC, 0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE}    // Japanese Traditional
 };
 
-} } } }
+}
 
 #endif // INCLUDED_I18NPOOL_SOURCE_NATIVENUMBER_DATA_NUMBERCHAR_H
 
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index aeb3e3caca97..be9ab74a81aa 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -28,6 +28,7 @@
 #include <memory>
 
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
 
 typedef struct {
@@ -55,7 +56,7 @@ typedef struct {
 #define NUMBER_OMIT_ONE_67 (NUMBER_OMIT_ONE_6|NUMBER_OMIT_ONE_7)
 #define NUMBER_OMIT_ZERO_ONE_67 ( NUMBER_OMIT_ZERO|NUMBER_OMIT_ONE_67 )
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh);
 
@@ -1051,14 +1052,14 @@ NativeNumberSupplierService::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_NativeNumberSupplier_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::NativeNumberSupplierService());
+    return cppu::acquire(new i18npool::NativeNumberSupplierService());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 4543bf2004b0..bb821d670e48 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 
 OrdinalSuffixService::OrdinalSuffixService()
@@ -152,14 +152,14 @@ Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_OrdinalSuffix_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::OrdinalSuffixService());
+    return cppu::acquire(new i18npool::OrdinalSuffixService());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index d08d33b7b7e3..ce73552f04f4 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -60,6 +60,8 @@
 #include <textconversion.hxx>
 
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::i18n;
+using namespace i18npool;
 
 #define IMPL_CREATEINSTANCE( ImplName ) \
     uno::Reference< uno::XInterface >   \
@@ -94,8 +96,6 @@ typedef uno::Reference<
         &implName##_CreateInstance }
 
 
-using namespace i18n;
-
 // At least for iOS it doesn't hurt if we have lots of functions here
 // generated by these lovely macros that get compiled, but then no
 // references to them thanks to the WITH_LOCALE ifdefs for the
diff --git a/i18npool/source/textconversion/genconv_dict.cxx b/i18npool/source/textconversion/genconv_dict.cxx
index 13c234670af3..91836a392864 100644
--- a/i18npool/source/textconversion/genconv_dict.cxx
+++ b/i18npool/source/textconversion/genconv_dict.cxx
@@ -117,7 +117,7 @@ void make_hhc_char(FILE *sfp, FILE *cfp)
     }
     fprintf(cfp, "\n};\n");
 
-    fprintf(cfp, "\nstatic const com::sun::star::i18n::Hangul_Index Hangul2HanjaIndex[] = {\n");
+    fprintf(cfp, "\nstatic const i18npool::Hangul_Index Hangul2HanjaIndex[] = {\n");
     for (i = 0; i < count; i++)
         fprintf(cfp, "\t{ 0x%04x, 0x%04x, 0x%02x },\n",
                         Hangul2HanjaData[i][0],
@@ -164,8 +164,8 @@ void make_hhc_char(FILE *sfp, FILE *cfp)
 
     // create function to return arrays
     fprintf (cfp, "\tconst sal_Unicode* getHangul2HanjaData() { return Hangul2HanjaData; }\n");
-    fprintf (cfp, "\tconst com::sun::star::i18n::Hangul_Index* getHangul2HanjaIndex() { return Hangul2HanjaIndex; }\n");
-    fprintf (cfp, "\tsal_Int16 getHangul2HanjaIndexCount() { return sizeof(Hangul2HanjaIndex) / sizeof(com::sun::star::i18n::Hangul_Index); }\n");
+    fprintf (cfp, "\tconst i18npool::Hangul_Index* getHangul2HanjaIndex() { return Hangul2HanjaIndex; }\n");
+    fprintf (cfp, "\tsal_Int16 getHangul2HanjaIndexCount() { return sizeof(Hangul2HanjaIndex) / sizeof(i18npool::Hangul_Index); }\n");
     fprintf (cfp, "\tconst sal_uInt16* getHanja2HangulIndex() { return Hanja2HangulIndex; }\n");
     fprintf (cfp, "\tconst sal_Unicode* getHanja2HangulData() { return Hanja2HangulData; }\n");
 }
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index 7421c5dce776..002ba056cdb1 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -23,7 +23,7 @@
 
 using namespace com::sun::star::uno;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #ifndef DISABLE_DYNLOADING
 
@@ -89,6 +89,6 @@ TextConversionService::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index 4451a291249d..2237fef42820 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.cxx
@@ -24,9 +24,10 @@
 #include <localedata.hxx>
 
 using namespace com::sun::star::lang;
+using namespace ::com::sun::star::i18n;
 using namespace com::sun::star::uno;
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 TextConversionResult SAL_CALL
 TextConversionImpl::getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
@@ -121,14 +122,14 @@ TextConversionImpl::getSupportedServiceNames()
     return aRet;
 }
 
-} } } }
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_i18n_TextConversion_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::TextConversionImpl(context));
+    return cppu::acquire(new i18npool::TextConversionImpl(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index 645acc93144c..23fabd706df1 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -35,7 +35,7 @@ using namespace com::sun::star::linguistic2;
 using namespace com::sun::star::uno;
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 #define SCRIPT_OTHERS   0
 #define SCRIPT_HANJA    1
@@ -348,6 +348,6 @@ TextConversion_ko::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /
     return true;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index ae08f5221e3d..f9a938137580 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -35,7 +35,7 @@ using namespace com::sun::star::linguistic2;
 using namespace com::sun::star::uno;
 
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
 
 TextConversion_zh::TextConversion_zh( const Reference < XComponentContext >& xContext )
     : TextConversionService("com.sun.star.i18n.TextConversion_zh")
@@ -327,6 +327,6 @@ TextConversion_zh::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /
     return false;
 }
 
-} } } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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: */
author	Noel Grandin <noel.grandin@collabora.co.uk>	2017-10-03 14:16:24 +0200
committer	Noel Grandin <noel.grandin@collabora.co.uk>	2017-10-04 08:39:11 +0200
commit	6ce77cac03123f2bf5c9b6698a3f80e32d7fbe85 (patch)
tree	abdd40004f9a98c3be7f37e8e0027639456cd688 /i18npool/source
parent	f2db08b28e99c61c44bc057d03de926ac33d93b7 (diff)