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

21 files changed, 24 insertions, 24 deletions

diff --git a/svl/CppunitTest_svl_qa_cppunit.mk b/svl/CppunitTest_svl_qa_cppunit.mk
index 5a35e49f7356..7480d76796b0 100644
--- a/svl/CppunitTest_svl_qa_cppunit.mk
+++ b/svl/CppunitTest_svl_qa_cppunit.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_qa_cppunit, \
 	comphelper \
 	cppu \
 	cppuhelper \
-	i18nisolang1 \
+	i18nlangtag \
 	sal \
 	sot \
 	svl \
diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk
index 1df1cb7d13da..da4d04b98a2c 100644
--- a/svl/CppunitTest_svl_urihelper.mk
+++ b/svl/CppunitTest_svl_urihelper.mk
@@ -46,9 +46,9 @@ svl/qa/unit/test_URIHelper \
 $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \
     cppu \
     cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
     sal \
-	i18nisolang1 \
+	i18nlangtag \
     svl \
     tl \
     utl \
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index dd9decbf1575..fcd83ad8f7aa 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,svl,\
     comphelper \
     cppu \
     cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
     i18nutil \
     $(if $(filter TRUE,$(SOLAR_JAVA)), \
         jvmfwk) \
diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx
index a68d7911d37c..3a2c208b654b 100644
--- a/svl/inc/svl/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
@@ -22,7 +22,7 @@
 
 #include "svl/svldllapi.h"
 #include <tools/inetmime.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 
 //============================================================================
 /** Definitions for frequently used media type names.
diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx
index d25ba7abcbf9..6bb0b5ed693a 100644
--- a/svl/inc/svl/languageoptions.hxx
+++ b/svl/inc/svl/languageoptions.hxx
@@ -25,7 +25,7 @@
 #include <svl/lstner.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/options.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 
 // class SvtLanguageOptions ----------------------------------------------------
 
diff --git a/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx
index 1aa78516b57a..b3a2c42e11e6 100644
--- a/svl/inc/svl/ondemand.hxx
+++ b/svl/inc/svl/ondemand.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_ONDEMAND_HXX
 
 #include <unotools/syslocale.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/calendarwrapper.hxx>
 #include <unotools/collatorwrapper.hxx>
diff --git a/svl/inc/svl/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx
index 2505c7e5b444..f9bcbdc7f917 100644
--- a/svl/inc/svl/sfontitm.hxx
+++ b/svl/inc/svl/sfontitm.hxx
@@ -22,7 +22,7 @@
 
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <svl/poolitem.hxx>
 
 //============================================================================
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 9167bfc33790..d5c84235a4f9 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -23,7 +23,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/string.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/NumberFormatCode.hpp>
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 6b0a054a2021..dd8e9ff60f50 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -20,7 +20,7 @@
 #define _ZFORMAT_HXX
 
 #include "svl/svldllapi.h"
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/nfversi.hxx>
 #include <svl/nfkeytab.hxx>
@@ -566,7 +566,7 @@ private:
      * @param nPos position (see above).
      *
      * @return struct containing numeral shape, calendar type, and LCID that
-     *         specifies language type. See i18npool/lang.h for a complete
+     *         specifies language type. See i18nlangtag/lang.h for a complete
      *         list of language types. These numbers also correspond with the
      *         numbers used by Microsoft Office.
      */
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 0b72db3a9000..d67a2c3b2168 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/sheet/GeneralFunction.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 
 #include "svl/zforlist.hxx"
 #include "svl/zformat.hxx"
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 897c9c8aefce..1ba855cb36cc 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -21,7 +21,7 @@
 #include <svl/cjkoptions.hxx>
 
 #include <svl/languageoptions.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.h>
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 9a4fcb1d2caa..78f0a548d3e9 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -21,7 +21,7 @@
 #include <svl/ctloptions.hxx>
 
 #include <svl/languageoptions.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.h>
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index cdf61e81f271..98b9bdee1e91 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -21,8 +21,8 @@
 #include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 9567170054cc..2560b0b78cda 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/util/XReplaceDescriptor.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <svl/memberid.hrc>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 
 using namespace utl;
 using namespace com::sun::star::beans;
diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx
index 866fd8f7d188..faed06461969 100644
--- a/svl/source/misc/getstringresource.cxx
+++ b/svl/source/misc/getstringresource.cxx
@@ -23,7 +23,7 @@
 
 #include "boost/noncopyable.hpp"
 #include "boost/scoped_ptr.hpp"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include "rtl/instance.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.hxx"
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index dd8d286539c0..40f34e98f738 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -19,7 +19,7 @@
 
 
 #include <tools/color.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index a82bb0a76c51..bcf572235ac1 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -20,7 +20,7 @@
 #include "supservs.hxx"
 #include <com/sun/star/lang/Locale.hpp>
 #include <comphelper/sharedmutex.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 #include <tools/stream.hxx>
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 7fa3241850bb..f432c6eb9b19 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -20,7 +20,7 @@
 #include <comphelper/string.hxx>
 #include <tools/debug.hxx>
 #include <unotools/charclass.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/numberformatcodewrapper.hxx>
 #include <unotools/calendarwrapper.hxx>
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 73cc37c84703..77bcf77e5f17 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -25,7 +25,7 @@
 #include <comphelper/string.hxx>
 #include <tools/debug.hxx>
 #include <osl/diagnose.h>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <rtl/math.hxx>
 #include <rtl/instance.hxx>
 #include <unotools/charclass.hxx>
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 73e6add49ca6..f7c987a1a000 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <comphelper/string.hxx>
 #include <tools/debug.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/numberformatcodewrapper.hxx>
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 0ce11eb56996..a93ef9660e28 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -21,7 +21,7 @@
 
 #include <tools/string.hxx>
 #include <tools/date.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/color.hxx>
 #include <svl/nfkeytab.hxx>
 #include <svl/nfsymbol.hxx>