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
2013-04-05 18:40:39 +02:00 · 2013-04-05 18:40:39 +02:00 · 876c619b94
commit 876c619b94
parent 8ef9e38aa8
475 changed files with 691 additions and 660 deletions
--- a/Library_merged.mk
+++ b/Library_merged.mk
@ -33,7 +33,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
 	comphelper \
 	cppu \
 	cppuhelper \
-	i18nisolang1 \
+	i18nlangtag \
 	sal \
 	salhelper \
 	tl \
--- a/Repository.mk
+++ b/Repository.mk
@ -556,7 +556,7 @@ endif

 $(eval $(call gb_Helper_register_libraries,RTLIBS, \
    comphelper \
-    i18nisolang1 \
+    i18nlangtag \
    i18nutil \
    ucbhelper \
 ))
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@ -113,7 +113,7 @@ gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library
 gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst db47:idb47%,db47:libdb47%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst exslt:iexslt%,exslt:libexslt%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nlangtag:ii18nlangtag%,i18nlangtag:ii18nlangtag,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst lpsolve55:ilpsolve55%,lpsolve55:lpsolve55%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst package2:ipackage2%,package2:ipackage%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 	cppu \
 	cppuhelper \
 	external \
-	i18npool \
+	i18nlangtag \
 	i18nutil \
 	idl \
 	idlc \
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@ -91,6 +91,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,HUNSPELL,hunspell) \
 	hwpfilter \
 	$(call gb_Helper_optional,HYPHEN,hyphen) \
+	i18nlangtag \
 	i18npool \
 	i18nutil \
 	$(call gb_Helper_optional,ICU,icu) \
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_libraries,acc,\
    cppu \
    cppuhelper \
    sal \
-    i18nisolang1 \
+    i18nlangtag \
    sot \
    svl \
    svt \
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@ -69,7 +69,7 @@ copy-stuff:
 		  fastsax.uno \
 		  frmlo \
 		  gcc3_uno \
-		  i18nisolang1gcc3 \
+		  i18nlangtaggcc3 \
 		  icudatalo \
 		  icui18nlo \
 		  iculelo \
--- a/android/qa/simple/Makefile
+++ b/android/qa/simple/Makefile
@ -65,7 +65,7 @@ copy-stuff:
 	for F in $(strip \
 		  comphelpgcc3 \
 		  gcc3_uno \
-		  i18nisolang1gcc3 \
+		  i18nlangtaggcc3 \
 		  icudatalo \
 		  icui18nlo \
 		  icuuclo \
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
 	cppu \
 	cppuhelper \
 	sal \
-	i18nisolang1 \
+	i18nlangtag \
 	sfx \
 	svl \
 	svt \
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,basctl,\
 	editeng \
 	fwe \
 	sal \
-	i18nisolang1 \
+	i18nlangtag \
 	sb \
 	sfx \
 	sot \
--- a/basic/CppunitTest_basic_coverage.mk
+++ b/basic/CppunitTest_basic_coverage.mk
@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_coverage, \
    utl \
    vcl \
    xmlscript \
-    i18nisolang1 \
+    i18nlangtag \
    $(gb_UWINAPI) \
 ))

--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@ -21,7 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
    cppuhelper \
    sal \
    salhelper \
-	i18nisolang1 \
+	i18nlangtag \
    sb \
    sot \
    svl \
--- a/basic/CppunitTest_basic_vba.mk
+++ b/basic/CppunitTest_basic_vba.mk
@ -21,7 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_vba, \
    comphelper \
    cppu \
    cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
    sal \
    salhelper \
    sb \
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,sb,\
 	cppuhelper \
 	sal \
 	salhelper \
-	i18nisolang1 \
+	i18nlangtag \
 	sot \
 	svl \
 	svt \
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
@ -20,7 +20,7 @@
 #ifndef _SBXBASE_HXX
 #define _SBXBASE_HXX

-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <basic/sbxdef.hxx>
 #include "basicdllapi.h"
 #include <boost/ptr_container/ptr_vector.hpp>
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@ -11,7 +11,7 @@
 #include <osl/file.hxx>
 #include "basic/sbmod.hxx"
 #include "basic/sbmeth.hxx"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <unotools/syslocaleoptions.hxx>

 namespace
--- a/basic/source/classes/global.cxx
+++ b/basic/source/classes/global.cxx
@ -28,7 +28,7 @@

 #include "basic/global.hxx"
 #include <comphelper/processfactory.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <rtl/instance.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <vcl/svapp.hxx>
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@ -28,7 +28,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/file.hxx>
 #include <rtl/math.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>

 #include <vector>
 #include <com/sun/star/lang/XComponent.hpp>
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@ -33,7 +33,7 @@
 #include <unotools/charclass.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <tools/wldcrd.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>

--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@ -21,7 +21,7 @@
 #include <svl/zforlist.hxx>
 #include <tools/errcode.hxx>
 #include <tools/color.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 #include "math.h"
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\
 	vcl \
 	tk \
 	tl \
-	i18nisolang1 \
+	i18nlangtag \
 	canvastools \
 	$(gb_UWINAPI) \
 ))
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@ -62,7 +62,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\
 	vcl \
 	tl \
 	utl \
-	i18nisolang1 \
+	i18nlangtag \
 	$(gb_UWINAPI) \
 ))

--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@ -68,7 +68,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\
 	vcl \
 	tl \
 	utl \
-	i18nisolang1 \
+	i18nlangtag \
 	$(gb_UWINAPI) \
 ))

--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\
 	comphelper \
 	cppu \
 	cppuhelper \
-	i18nisolang1 \
+	i18nlangtag \
 	sal \
 	svt \
 	tk \
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.cxx
@ -25,7 +25,7 @@
 #include <basegfx/numeric/ftools.hxx>

 #include <vcl/metric.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>

 #include "cairo_canvasfont.hxx"
 #include "cairo_textlayout.hxx"
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@ -39,7 +39,7 @@
 #include <canvas/debug.hxx>
 #include "dx_impltools.hxx"
 #include <vcl/sysdata.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include "dx_textlayout_drawhelper.hxx"
 #include "dx_bitmap.hxx"
 #include "dx_canvasfont.hxx"
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@ -22,7 +22,7 @@

 #include <rtl/math.hxx>
 #include <basegfx/numeric/ftools.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <vcl/metric.hxx>

 #include <com/sun/star/rendering/PanoseProportion.hpp>
--- a/chart2/CppunitTest_chart2_importtest.mk
+++ b/chart2/CppunitTest_chart2_importtest.mk
@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
    fileacc \
    for \
    forui \
-    i18nisolang1 \
+    i18nlangtag \
    msfilter \
    oox \
    sal \
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
    drawinglayer \
    editeng \
    sal \
-	i18nisolang1 \
+	i18nlangtag \
    sfx \
    sot \
    svl \
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
 	drawinglayer \
 	editeng \
    fwe \
-    i18nisolang1 \
+    i18nlangtag \
    sal \
 	sfx \
    svl \
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@ -44,8 +44,8 @@

 // header for struct SvtLinguConfig
 #include <unotools/lingucfg.hxx>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <vcl/outdev.hxx>

 using namespace ::com::sun::star;
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@ -25,7 +25,7 @@
 // header for class SvNumberformat
 #include <svl/zformat.hxx>
 #include <tools/color.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <com/sun/star/util/DateTime.hpp>

 //.............................................................................
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@ -48,7 +48,7 @@ $(eval $(call gb_Library_use_libraries,comphelper,\
    sal \
    salhelper \
    ucbhelper \
-	i18nisolang1 \
+	i18nlangtag \
 	$(gb_UWINAPI) \
 ))

--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@ -49,7 +49,7 @@
 #include "rtl/instance.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.hxx"
-#include "i18npool/languagetag.hxx"
+#include "i18nlangtag/languagetag.hxx"

 namespace {

--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@ -74,7 +74,7 @@ $(eval $(call gb_Library_use_libraries,configmgr, \
    sal \
    salhelper \
    xmlreader \
-	i18nisolang1 \
+	i18nlangtag \
 	$(gb_UWINAPI) \
 ))

--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@ -56,7 +56,7 @@
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"

-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>

 #include "components.hxx"
 #include "configurationprovider.hxx"
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_ado, \
    cppu \
    cppuhelper \
 	dbtools \
-    i18nisolang1 \
+    i18nlangtag \
    ado \
    sal \
    salhelper \
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@ -44,7 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \
    comphelper \
    cppu \
    cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
    $(if $(filter TRUE,$(SOLAR_JAVA)), \
        jvmaccess) \
    sal \
--- a/connectivity/CppunitTest_connectivity_mork.mk
+++ b/connectivity/CppunitTest_connectivity_mork.mk
@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_mork, \
    comphelper \
    cppu \
    cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
    mork \
    sal \
    salhelper \
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@ -57,7 +57,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
 	utl \
 	tl \
 	comphelper \
-	i18nisolang1 \
+	i18nlangtag \
 	$(gb_UWINAPI) \
 ))

--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_libraries,flat,\
 	tl \
 	svl \
 	utl \
-	i18nisolang1 \
+	i18nlangtag \
 	sal \
 	salhelper \
 	dbtools \
--- a/connectivity/Library_hsqldb.mk
+++ b/connectivity/Library_hsqldb.mk
@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\
 	salhelper \
 	tl \
 	utl \
-	i18nisolang1 \
+	i18nlangtag \
 	$(gb_UWINAPI) \
 ))

--- a/connectivity/inc/pch/precompiled_file.hxx
+++ b/connectivity/inc/pch/precompiled_file.hxx
@ -51,7 +51,7 @@
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <iterator>
 #include <osl/diagnose.h>
 #include <osl/nlsupport.h>
--- a/connectivity/inc/pch/precompiled_flat.hxx
+++ b/connectivity/inc/pch/precompiled_flat.hxx
@ -41,7 +41,7 @@
 #include <comphelper/types.hxx>
 #include <cppuhelper/factory.hxx>
 #include <ctype.h>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <osl/thread.h>
 #include <rtl/logfile.hxx>
 #include <rtl/math.hxx>
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@ -30,8 +30,8 @@
 #include <com/sun/star/sdbc/DataType.hpp>

 #include <tools/diagnose_ex.h>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <comphelper/numbers.hxx>
 #include <comphelper/componentcontext.hxx>
 #include <unotools/sharedunocomponent.hxx>
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@ -20,7 +20,7 @@
 #include "file/fcode.hxx"
 #include <osl/diagnose.h>
 #include "connectivity/sqlparse.hxx"
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
 #include "TConnection.hxx"
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@ -40,7 +40,7 @@
 #include <com/sun/star/util/NumberFormatter.hpp>
 #include <com/sun/star/util/NumberFormatsSupplier.hpp>
 #include <unotools/configmgr.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include "connectivity/dbconversion.hxx"
 #include "file/quotedstring.hxx"
 #include <unotools/syslocale.hxx>
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@ -50,7 +50,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include "resource/hsqldb_res.hrc"
 #include "resource/sharedresources.hxx"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>

 #include <o3tl/compat_functional.hxx>

--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@ -40,7 +40,7 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\
 	comphelper \
 	cppu \
 	cppuhelper \
-	i18nisolang1 \
+	i18nlangtag \
 	sal \
 	svt \
 	tl \
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@ -62,7 +62,7 @@
 #include <vcl/metric.hxx>
 #include <vcl/graphictools.hxx>
 #include <tools/poly.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <implrenderer.hxx>
 #include <tools.hxx>
 #include <outdevstate.hxx>
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,cui,\
    cppuhelper \
    drawinglayer \
    editeng \
-    i18nisolang1 \
+    i18nlangtag \
    $(if $(filter TRUE,$(SOLAR_JAVA)), \
        jvmfwk) \
    lng \
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@ -20,7 +20,7 @@
 #define _SVX_SPELL_ATTRIB

 #include <vcl/txtattr.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/lang/Locale.hpp>
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@ -40,7 +40,7 @@
 #include <svx/langbox.hxx>
 #include <svtools/langtab.hxx>
 #include <unotools/lingucfg.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <osl/file.hxx>
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@ -24,7 +24,7 @@
 #include <optasian.hrc>
 #include <dialmgr.hxx>
 #include <cuires.hrc>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <tools/shl.hxx>
 #include <svl/asiancfg.hxx>
 #include <com/sun/star/lang/Locale.hpp>
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@ -29,8 +29,8 @@
 #include <vcl/configsettings.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/mnemonic.hxx>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <unotools/compatibility.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/fontoptions.hxx>
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@ -18,7 +18,7 @@
 */

 #include <comphelper/string.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <tools/shl.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@ -21,7 +21,7 @@
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <tools/shl.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <unotools/lingucfg.hxx>
 #include <editeng/unolingu.hxx>
 #include <svx/dlgutil.hxx>
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@ -23,7 +23,7 @@
 #include <vcl/builder.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <svx/dialogs.hrc>
 #include <svtools/colorcfg.hxx>

--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@ -25,7 +25,7 @@
 #include <numpages.hrc>
 #include <dialmgr.hxx>
 #include <tools/shl.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <helpid.hrc>
 #include <editeng/numitem.hxx>
 #include <svl/eitem.hxx>
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@ -46,7 +46,7 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
    fileacc \
    for \
    forui \
-    i18nisolang1 \
+    i18nlangtag \
    msfilter \
    oox \
    sal \
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,dba,\
    cppuhelper \
    dbtools \
    fwe \
-    i18nisolang1 \
+    i18nlangtag \
    sal \
    salhelper \
 	sax \
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@ -64,7 +64,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\
    fwe \
    sal \
    salhelper \
-	i18nisolang1 \
+	i18nlangtag \
    sfx \
    sot \
    svl \
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@ -332,7 +332,7 @@
 #include <framework/titlehelper.hxx>
 #include <framework/undomanagerhelper.hxx>
 #include <functional>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <jvmaccess/virtualmachine.hxx>
 #include <limits>
 #include <list>
--- a/dbaccess/source/core/misc/userinformation.cxx
+++ b/dbaccess/source/core/misc/userinformation.cxx
@ -21,7 +21,7 @@
 #include "userinformation.hxx"

 #include <osl/diagnose.h>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <unotools/configmgr.hxx>

 using namespace ::utl;
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@ -49,7 +49,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/contnr.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include "WCopyTable.hxx"
 #include "WExtendPages.hxx"
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\
    ucbhelper \
    utl \
    xmlscript \
-    i18nisolang1 \
+    i18nlangtag \
 	$(gb_UWINAPI) \
 ))

--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\
    cppu \
    cppuhelper \
    deploymentmisc \
-    i18nisolang1 \
+    i18nlangtag \
    sal \
    salhelper \
    sfx \
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\
    ucbhelper \
    utl \
    xmlscript \
-    i18nisolang1 \
+    i18nlangtag \
 	$(gb_UWINAPI) \
 ))

--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_sdk_api,migrationoo2))
 $(eval $(call gb_Library_use_libraries,migrationoo2,\
    cppu \
    cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
    $(if $(filter TRUE,$(SOLAR_JAVA)), \
        jvmfwk) \
    sal \
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@ -51,7 +51,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
    cppu \
    cppuhelper \
    deploymentmisc \
-    i18nisolang1 \
+    i18nlangtag \
    sal \
    salhelper \
    sfx \
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\
    ucbhelper \
    utl \
    vcl \
-    i18nisolang1 \
+    i18nlangtag \
 	$(gb_UWINAPI) \
 ))

--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@ -30,7 +30,7 @@ $(eval $(call gb_Pagein_Pagein,common))
 # sorted in approx. reverse load order (ld.so.1)
 $(eval $(call gb_Pagein_add_objects,common,\
    $(if $(MERGELIBS),merged) \
-    i18npool \
+    i18nlangtag \
    $(if $(findstring YES,$(SYSTEM_ICU)),,\
        icui18n \
        icule \
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@ -28,8 +28,8 @@
 #include <unotools/pathoptions.hxx>
 #include <tools/resid.hxx>
 #include <tools/config.hxx>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@ -41,7 +41,7 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <com/sun/star/lang/XLocalizable.hpp>
 #include <com/sun/star/lang/Locale.hpp>

--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@ -27,7 +27,7 @@
 #include "comphelper/processfactory.hxx"
 #include "comphelper/servicedecl.hxx"
 #include "comphelper/unwrapargs.hxx"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include "vcl/svapp.hxx"
 #include "vcl/msgbox.hxx"
 #include "com/sun/star/lang/XServiceInfo.hpp"
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@ -23,7 +23,7 @@
 #include "unotools/configmgr.hxx"
 #include "comphelper/servicedecl.hxx"
 #include "comphelper/unwrapargs.hxx"
-#include "i18npool/mslangid.hxx"
+#include "i18nlangtag/mslangid.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/msgbox.hxx"
 #include "toolkit/helper/vclunohelper.hxx"
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@ -22,7 +22,7 @@

 #include "tools/string.hxx"
 #include "tools/resid.hxx"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include "dp_misc.h"
 #include <memory>
 #include "dp_misc_api.hxx"
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@ -26,7 +26,7 @@
 #include "rtl/ustring.h"
 #include "cppuhelper/implbase1.hxx"
 #include "unotools/configmgr.hxx"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>


 using namespace ::com::sun::star;
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@ -34,7 +34,7 @@
 #include <unotools/bootstrap.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/uri.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@ -25,7 +25,7 @@
 #include "tools/resmgr.hxx"
 #include "rtl/ustring.hxx"
 #include "unotools/configmgr.hxx"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>

 #define APP_NAME "unopkg"

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 26b7c425b0cecaad38249bfdc17b8d5cecee2670
+Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\
    cppcanvas \
    cppu \
    cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
    sal \
    svl \
    svt \
--- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
@ -28,7 +28,7 @@
 #include <svtools/optionsdrawinglayer.hxx>
 #include <com/sun/star/rendering/ViewState.hpp>
 #include <com/sun/star/rendering/RenderState.hpp>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <vcl/mapmod.hxx>

--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@ -48,7 +48,7 @@
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <drawinglayer/primitive2d/textlineprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx>
 #include <drawinglayer/primitive2d/epsprimitive2d.hxx>
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@ -24,7 +24,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/font.hxx>
 #include <vcl/metric.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <vcl/svapp.hxx>

--- a/drawinglayer/source/processor2d/getdigitlanguage.cxx
+++ b/drawinglayer/source/processor2d/getdigitlanguage.cxx
@ -29,7 +29,7 @@

 #include "sal/config.h"

-#include "i18npool/lang.h"
+#include "i18nlangtag/lang.h"
 #include "svl/ctloptions.hxx"
 #include "vcl/svapp.hxx"

--- a/drawinglayer/source/processor2d/getdigitlanguage.hxx
+++ b/drawinglayer/source/processor2d/getdigitlanguage.hxx
@ -32,7 +32,7 @@

 #include "sal/config.h"

-#include "i18npool/lang.h"
+#include "i18nlangtag/lang.h"

 namespace drawinglayer { namespace detail {

--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \
    cppu \
    sal \
    salhelper \
-    i18nisolang1 \
+    i18nlangtag \
    i18nutil \
 	$(gb_UWINAPI) \
 ))
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \
    comphelper \
    cppu \
    cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
    i18nutil \
    lng \
    sal \
--- a/editeng/CppunitTest_editeng_lookuptree.mk
+++ b/editeng/CppunitTest_editeng_lookuptree.mk
@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \
    cppu \
    sal \
    salhelper \
-    i18nisolang1 \
+    i18nlangtag \
    i18nutil \
 	$(gb_UWINAPI) \
 ))
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@ -139,7 +139,7 @@ $(eval $(call gb_Library_use_libraries,editeng,\
    cppu \
    sal \
    salhelper \
-    i18nisolang1 \
+    i18nlangtag \
    i18nutil \
 	$(gb_UWINAPI) \
 ))
--- a/editeng/inc/editeng/SpellPortions.hxx
+++ b/editeng/inc/editeng/SpellPortions.hxx
@ -20,7 +20,7 @@
 #ifndef SVX_SPELL_PORTIONS_HXX
 #define SVX_SPELL_PORTIONS_HXX

-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/linguistic2/SingleProofreadingError.hpp>
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@ -28,7 +28,7 @@

 #include <rsc/rscsfx.hxx>
 #include <editeng/editdata.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include "editeng/editengdllapi.h"

 #include <tools/rtti.hxx>   // due to typedef TypeId
--- a/editeng/inc/editeng/editstat.hxx
+++ b/editeng/inc/editeng/editstat.hxx
@ -21,7 +21,7 @@
 #define _EDITSTAT_HXX

 #include <tools/string.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>

 #define EE_CNTRL_USECHARATTRIBS     0x00000001  // Use of hard character attributes
 #define EE_CNTRL_USEPARAATTRIBS     0x00000002  // Using paragraph attributes.
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@ -23,7 +23,7 @@
 #include <com/sun/star/i18n/WordType.hpp>

 #include <rsc/rscsfx.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/color.hxx>
 #include <tools/gen.hxx>

--- a/editeng/inc/editeng/edtdlg.hxx
+++ b/editeng/inc/editeng/edtdlg.hxx
@ -22,7 +22,7 @@
 #include <tools/solar.h>
 #include <tools/string.hxx>
 #include <editeng/editengdllapi.h>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <vcl/abstdlg.hxx>
 #include <editeng/hangulhanja.hxx>
--- a/editeng/inc/editeng/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@ -19,7 +19,7 @@
 #ifndef _SVX_FLDITEM_HXX
 #define _SVX_FLDITEM_HXX

-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/time.hxx>
 #include <tools/date.hxx>
 #include <svl/poolitem.hxx>
--- a/editeng/inc/editeng/hangulhanja.hxx
+++ b/editeng/inc/editeng/hangulhanja.hxx
@ -25,7 +25,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include "editeng/editengdllapi.h"
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>

 //.............................................................................
 namespace editeng
--- a/editeng/inc/editeng/langitem.hxx
+++ b/editeng/inc/editeng/langitem.hxx
@ -20,7 +20,7 @@
 #define _SVX_LANGITEM_HXX

 #include <svl/eitem.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <editeng/editengdllapi.h>

 class SvXMLUnitConverter;
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@ -25,7 +25,7 @@
 #include <svl/brdcst.hxx>

 #include <editeng/editdata.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
 #include <vcl/graph.hxx>
--- a/Show more
+++ b/Show more