From 876c619b944dfbc88464045f1400c549a01a1164 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Fri, 5 Apr 2013 18:40:39 +0200
Subject: new module i18nlangtag

Moved portions from module i18npool, all of former i18nisolang1 library
that now is i18nlangtag. Included are languagetag, isolang and mslangid.

This i18nlangtag code is now even used by module comphelper, so
disentangling i18npool and making this an own module was needed to not
create circular module dependencies.

Change-Id: Ib887c3d6dde667403fd22d382310ba5f1a9b0015
---
 linguistic/Library_lng.mk          | 2 +-
 linguistic/inc/iprcache.hxx        | 2 +-
 linguistic/inc/linguistic/misc.hxx | 2 +-
 linguistic/source/convdic.cxx      | 2 +-
 linguistic/source/convdicxml.cxx   | 2 +-
 linguistic/source/dicimp.cxx       | 4 ++--
 linguistic/source/dlistimp.cxx     | 2 +-
 linguistic/source/gciterator.cxx   | 2 +-
 linguistic/source/hhconvdic.cxx    | 2 +-
 linguistic/source/hyphdsp.cxx      | 2 +-
 linguistic/source/lngopt.cxx       | 2 +-
 linguistic/source/lngsvcmgr.cxx    | 4 ++--
 linguistic/source/misc.cxx         | 2 +-
 linguistic/source/thesdsp.cxx      | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'linguistic')

diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 9d520cddf036..2be2af17d5af 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_libraries,lng,\
 	comphelper \
 	cppu \
 	cppuhelper \
-	i18nisolang1 \
+	i18nlangtag \
 	sal \
 	svl \
 	tl \
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index 9f67ed29c0b7..ffc497a75a4a 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 
 #include <rtl/string.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 
 #include <set>
 #include <map>
diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx
index c7f91105d3fb..5b1e417eef1e 100644
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@ -33,7 +33,7 @@
 #include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
 #include <cppuhelper/implbase1.hxx> // helper for implementations
 #include <unotools/pathoptions.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/string.hxx>
 #include <unotools/charclass.hxx>
 #include <osl/thread.h>
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 58872b73fa63..6f4dde2756a7 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -19,7 +19,7 @@
 
 
 #include <cppuhelper/factory.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <osl/mutex.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 7ddf38fc5659..37bdc8a333c1 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -19,7 +19,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <tools/stream.hxx>
 #include <osl/mutex.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 4307d4c8f5be..470500a0247b 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -21,8 +21,8 @@
 #include <cppuhelper/factory.hxx>
 #include <dicimp.hxx>
 #include <hyphdsp.hxx>
-#include <i18npool/lang.h>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/lang.h>
+#include <i18nlangtag/languagetag.hxx>
 #include <osl/mutex.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 64152989fcc4..dbff7b795022 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -19,7 +19,7 @@
 
 
 #include <cppuhelper/factory.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <osl/file.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index aa35465364e3..1a3508c2a0b1 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -52,7 +52,7 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/factory.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/extract.hxx>
 
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 71cc782cfc1a..468a8dc34e46 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <unicode/uscript.h>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <osl/mutex.hxx>
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index e66d89000693..ba57aa6ab6b3 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <rtl/ustrbuf.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <unotools/localedatawrapper.hxx>
 #include <tools/debug.hxx>
 #include <svl/lngmisc.hxx>
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index aff53c3171d3..594f7b9335e7 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 63f456457b44..2950ba0402d4 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -31,8 +31,8 @@
 #include <tools/solar.h>
 #include <unotools/lingucfg.hxx>
 #include <comphelper/processfactory.hxx>
-#include <i18npool/lang.h>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/lang.h>
+#include <i18nlangtag/languagetag.hxx>
 #include <cppuhelper/factory.hxx>
 #include <comphelper/extract.hxx>
 #include <rtl/logfile.hxx>
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index f3d4159b1ae2..f71938ef82ad 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -23,7 +23,7 @@
 #include <unotools/pathoptions.hxx>
 #include <svl/lngmisc.hxx>
 #include <ucbhelper/content.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index dfd106f0eac7..fd476177cb2d 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/debug.hxx>
 #include <svl/lngmisc.hxx>
 
-- 
cgit