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

48 files changed, 54 insertions, 54 deletions

diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk
index 29fe221b2d3e..60b1f7cd05c8 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annotationobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index c85f6fd73f19..4e86a9bc4d0b 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk
index 0a77e006f553..e2f1bc66e058 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annotationsobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index 4175bb61724c..40a24e110e00 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index c45aa69857b4..07fa06b2b301 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index e08fd4b2cee6..07fb501b9796 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 453028b1e7ff..51c063ed7eeb 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index fda5431ccec3..2a0b56e1013c 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index f499daa03411..c0dee8e2e4ff 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index d92a4782f23f..ed64b625dcc1 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 291262ce9818..a3235e65173f 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index e5ca56cb61dc..91f07f5170e1 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 64071caaa025..17d61ca6f86b 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 33adc3e4cecf..f0a678347293 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 7650a4cc2552..cdf55c75cdb4 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk
index 0f18fee8458f..cab195a72fc6 100644
--- a/sc/CppunitTest_sc_outlineobj.mk
+++ b/sc/CppunitTest_sc_outlineobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_outlineobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index 3aac87cc45f8..590d14a420b0 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 23caa57b745f..e63caf2a9116 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 63ebc938fc77..a200dac23094 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 94b311049ed4..6fc0742e952a 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 7711f00e7c3f..4f0a3b0c700e 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index f2b2d477c067..87f00efaa59f 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetsobj, \
     fileacc \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     msfilter \
     oox \
     sal \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 762e35798049..00dc94237c00 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -57,7 +57,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
     editeng \
     for \
     forui \
-    i18nisolang1 \
+    i18nlangtag \
     sal \
     salhelper \
     sax \
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 0728846fb27f..527d0d7a1206 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -73,7 +73,7 @@ $(eval $(call gb_Library_use_libraries,sc,\
 	editeng \
 	for \
 	forui \
-	i18nisolang1 \
+	i18nlangtag \
 	sal \
 	salhelper \
 	sax \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 72910ecdabbb..a0e407b48a20 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\
 	tl \
 	utl \
 	vcl \
-	i18nisolang1 \
+	i18nlangtag \
 	$(gb_UWINAPI) \
 ))
 
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 4db5d8142749..ae34fdfee7b3 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,scui,\
 	editeng \
 	for \
 	forui \
-	i18nisolang1 \
+	i18nlangtag \
 	sal \
 	sc \
 	sfx \
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index b6c3b685e845..48d0b0a1ad7e 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/reflection/XIdlMethod.hpp>
 #include <com/sun/star/sheet/LocalizedName.hpp>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <rtl/ustring.h>
 #include "scdllapi.h"
 #include <rtl/ustring.hxx>
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index 69442bcc048d..3106d18ac0a1 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -21,7 +21,7 @@
 #define SC_CONVUNO_HXX
 
 #include <algorithm>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 5b3a5ad0121c..3bdb51f18b3d 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -21,7 +21,7 @@
 #define SC_SCGLOB_HXX
 
 #include "address.hxx"
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/stream.hxx>
 #include <osl/endian.h>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index b81439cdb5d2..857dcfd8bbd7 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -53,8 +53,8 @@
 #include "formula/grammar.hxx"
 #include "formula/opcode.hxx"
 #include "formula/token.hxx"
-#include "i18npool/lang.h"
-#include "i18npool/mslangid.hxx"
+#include "i18nlangtag/lang.h"
+#include "i18nlangtag/mslangid.hxx"
 #include "rtl/math.hxx"
 #include "rtl/strbuf.hxx"
 #include "rtl/ustrbuf.hxx"
@@ -565,9 +565,9 @@
 #include <formula/formulahelper.hxx>
 #include <formula/token.hxx>
 #include <functional>
-#include <i18npool/lang.h>
-#include <i18npool/languagetag.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/lang.h>
+#include <i18nlangtag/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <iostream>
 #include <limits.h>
 #include <limits>
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 8003cda1ccb4..b5cf97e53097 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -29,7 +29,7 @@
 #include "sc.hrc"
 #include "global.hxx"
 #include "pivot.hxx"
-#include "i18npool/lang.h"
+#include "i18nlangtag/lang.h"
 #include "asciiopt.hxx"
 
 #include <tabvwsh.hxx>
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index e161fc7c2052..58eda3a63f43 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -23,7 +23,7 @@
 #include "rtl/ustring.hxx"
 #include "tools/string.hxx"
 #include "scdllapi.h"
-#include "i18npool/lang.h"
+#include "i18nlangtag/lang.h"
 
 class SvNumberFormatter;
 
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index f0acf6d15026..1dbb74e3bb4c 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -21,7 +21,7 @@
 #define _ZFORAUTO_HXX_
 
 #include <tools/string.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 
 
 class SvStream;
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 6b49b70d82c8..897e93a601f5 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -42,7 +42,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdundo.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <editeng/unolingu.hxx>
 #include <svx/drawitem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index be9b38eb8353..bc665d6d099e 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -45,7 +45,7 @@
 #include <numeric>
 
 
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 0dc76c3b411a..546e5b9c0490 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -19,7 +19,7 @@
 
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <svx/algitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index adf388e3409c..e3eeb4a2b9c8 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <comphelper/processfactory.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/objsh.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx
index add7df3ded03..dc07cda3b5f7 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -20,8 +20,8 @@
 
 #include "cellkeytranslator.hxx"
 #include "comphelper/processfactory.hxx"
-#include "i18npool/mslangid.hxx"
-#include "i18npool/lang.h"
+#include "i18nlangtag/mslangid.hxx"
+#include "i18nlangtag/lang.h"
 #include "rtl/ustring.hxx"
 
 #include <com/sun/star/i18n/TransliterationModules.hpp>
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 75099014583b..2f1726d39485 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/beans/NamedValue.hpp>
 
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <sot/storage.hxx>
 #include "xlconst.hxx"
 #include "xltools.hxx"
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 295d5e6e2caf..2ceae6bc89e7 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -108,7 +108,7 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <tools/date.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <comphelper/extract.hxx>
 #include <tools/string.hxx>
 
diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx
index f2b4d8c58ac0..417f3c28fa99 100644
--- a/sc/source/ui/app/scmod2.cxx
+++ b/sc/source/ui/app/scmod2.cxx
@@ -19,8 +19,8 @@
 
 #include <editeng/unolingu.hxx>
 #include <unotools/lingucfg.hxx>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index cb697365fa64..c4a51aa184a6 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -21,7 +21,7 @@
 #undef SC_DLLIMPLEMENTATION
 
 #include <vcl/msgbox.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <svtools/collatorres.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 4aa8b99d629c..20e981f5b1f9 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -20,7 +20,7 @@
 #include "sc.hrc"
 
 #include <comphelper/processfactory.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <sot/formats.hxx>
 #include <sfx2/mieclip.hxx>
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index 7d3f69d2fdd8..05e7bcd0ba60 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -32,7 +32,7 @@
 #include <tools/stream.hxx>
 #include <svx/txencbox.hxx>
 #include "csvtablebox.hxx"
-#include "i18npool/lang.h"
+#include "i18nlangtag/lang.h"
 
 // ============================================================================
 
diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx
index 8bcd331e606e..e0198eebe11e 100644
--- a/sc/source/ui/inc/textimportoptions.hxx
+++ b/sc/source/ui/inc/textimportoptions.hxx
@@ -23,7 +23,7 @@
 #include "vcl/dialog.hxx"
 #include "vcl/button.hxx"
 #include "vcl/fixed.hxx"
-#include "i18npool/lang.h"
+#include "i18nlangtag/lang.h"
 #include "svx/langbox.hxx"
 
 class ScTextImportOptionsDlg : public ModalDialog
diff --git a/sc/source/ui/unoobj/convuno.cxx b/sc/source/ui/unoobj/convuno.cxx
index bf95b5e9190d..4a30dbdeda45 100644
--- a/sc/source/ui/unoobj/convuno.cxx
+++ b/sc/source/ui/unoobj/convuno.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 
 #include "convuno.hxx"
 #include "global.hxx"
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index 5cfd6a906322..8e100da64d57 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -22,7 +22,7 @@
 #include <svl/itemprop.hxx>
 #include <svx/unomid.hxx>
 #include <vcl/svapp.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index c1c2f2d60444..0357c88e213b 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -35,7 +35,7 @@
 
 #include "sc.hrc"
 #include "scabstdlg.hxx"
-#include "i18npool/lang.h"
+#include "i18nlangtag/lang.h"
 
 #include <memory>