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
---
 lingucomponent/Library_MacOSXSpell.mk                              | 2 +-
 lingucomponent/Library_hyphen.mk                                   | 2 +-
 lingucomponent/Library_lnth.mk                                     | 2 +-
 lingucomponent/Library_spell.mk                                    | 2 +-
 lingucomponent/StaticLibrary_ulingu.mk                             | 2 +-
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 2 +-
 lingucomponent/source/lingutil/lingutil.cxx                        | 4 ++--
 lingucomponent/source/spellcheck/spell/sspellimp.cxx               | 2 +-
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'lingucomponent')

diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk
index a8529b6f86be..d6679cffa030 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,MacOSXSpell,\
 	cppuhelper \
 	lng \
 	sal \
-	i18nisolang1 \
+	i18nlangtag \
 	svl \
 	tl \
 	ucbhelper \
diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk
index 73ede7673e81..2ea4183ff867 100644
--- a/lingucomponent/Library_hyphen.mk
+++ b/lingucomponent/Library_hyphen.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_sdk_api,hyphen))
 $(eval $(call gb_Library_use_libraries,hyphen,\
 	cppu \
 	cppuhelper \
-	i18nisolang1 \
+	i18nlangtag \
 	lng \
 	sal \
 	tl \
diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk
index 14ccf6b0eb0b..aeec7ed00ae7 100644
--- a/lingucomponent/Library_lnth.mk
+++ b/lingucomponent/Library_lnth.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Library_use_libraries,lnth,\
 	comphelper \
 	cppu \
 	cppuhelper \
-	i18nisolang1 \
+	i18nlangtag \
 	lng \
 	sal \
 	tl \
diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk
index 850c088e1836..06f97e4fac1a 100644
--- a/lingucomponent/Library_spell.mk
+++ b/lingucomponent/Library_spell.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_sdk_api,spell))
 $(eval $(call gb_Library_use_libraries,spell,\
 	cppu \
 	cppuhelper \
-	i18nisolang1 \
+	i18nlangtag \
 	lng \
 	sal \
 	tl \
diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
index a7aa35f13e9f..1a552b2c5c0b 100644
--- a/lingucomponent/StaticLibrary_ulingu.mk
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_packages,ulingu,\
 	comphelper_inc \
 	cppu_odk_headers \
 	cppuhelper_odk_headers \
-	i18npool_inc \
+	i18nlangtag_inc \
 	linguistic_inc \
 	sal_generated \
 	sal_odk_headers \
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 98f7e96c24fa..449d0e19268b 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -22,7 +22,7 @@
 
 #include <cppuhelper/factory.hxx>   // helper for factories
 #include <com/sun/star/registry/XRegistryKey.hpp>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index fc3818f219b6..52421ce095dc 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -26,8 +26,8 @@
 #include <osl/file.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
-#include <i18npool/languagetag.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/pathoptions.hxx>
 #include <rtl/ustring.hxx>
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index c5b873c82a39..54db8552b99c 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -34,7 +34,7 @@
 
 #include <linguistic/lngprops.hxx>
 #include <linguistic/spelldta.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/useroptions.hxx>
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 96cc46b8f208..6a302d7e1397 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
 #include <osl/mutex.hxx>
-- 
cgit