diff options
475 files changed, 689 insertions, 658 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index fb29c940717a..ec83497255f6 100644 --- 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 \ diff --git a/Repository.mk b/Repository.mk index a9262a7fb008..b45782c8e35c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -556,7 +556,7 @@ endif $(eval $(call gb_Helper_register_libraries,RTLIBS, \ comphelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ ucbhelper \ )) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 096571470058..733b52ad1f64 100644 --- 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)) diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index bc553227bdcf..ce8d0c17a90e 100644 --- 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 \ diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 1d20b5f9309a..be634fddb2ae 100644 --- 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) \ diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 0188b086a3b1..d188251fbaff 100644 --- 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 \ diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 7501fa6a3636..2734b519fbbe 100644 --- 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 \ diff --git a/android/qa/simple/Makefile b/android/qa/simple/Makefile index 7e217739c0c3..150c080be302 100644 --- 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 \ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index f77da34842aa..d308f3ec449d 100644 --- 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 \ diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 1025df8669eb..4e7d1d7e1822 100644 --- 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 \ diff --git a/basic/CppunitTest_basic_coverage.mk b/basic/CppunitTest_basic_coverage.mk index 55906f56d4a6..52585fb0b898 100644 --- 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) \ )) diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index bd566af81e23..ec0c928a7b66 100644 --- 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 \ diff --git a/basic/CppunitTest_basic_vba.mk b/basic/CppunitTest_basic_vba.mk index 25f41f34e8e4..9d61671b64e3 100644 --- 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 \ diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 8412735d6d89..35680567f8b7 100644 --- 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 \ diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx index 7b088bedda1e..16484ee929d8 100644 --- 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> diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx index ea2969a12cbf..56b9ab6a8412 100644 --- 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 diff --git a/basic/source/classes/global.cxx b/basic/source/classes/global.cxx index 43a3414f5e0a..3862bfb24f3e 100644 --- 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> diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index b1ba55b24063..fd0911ad9ee4 100644 --- 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> diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index f368ee2ca6cc..703f6d21cfc5 100644 --- 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> diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index f28c5851f954..40896b2aeb96 100644 --- 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" diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index f27639000dae..b76c35b90509 100644 --- 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) \ )) diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 98300e15eca5..6c29dcf80168 100644 --- 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) \ )) diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index c320ab2ab040..92b1754d5e90 100644 --- 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) \ )) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 0a27cead22ac..a31bf1b18d9a 100644 --- 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 \ diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 5541e72fc581..e4e8d245a2b9 100644 --- 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" diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index a73cda2e966c..62a124bd9878 100644 --- 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" diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index c314e5d3298c..549cf3e139cf 100644 --- 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> diff --git a/chart2/CppunitTest_chart2_importtest.mk b/chart2/CppunitTest_chart2_importtest.mk index c15973a4f005..e67d5b3bfdcd 100644 --- 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 \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 702516672503..601bdc75877f 100644 --- 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 \ diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 4ccb9c70116f..66fbfda6172b 100644 --- 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 \ diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index b04390e2c1a5..241f08add123 100644 --- 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; diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index 918c73c46dcf..508e2716f489 100644 --- 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> //............................................................................. diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 0c01ca2ca8b0..b9448580c5f7 100644 --- 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) \ )) diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx index 7e43bf1b0ea6..2935c4b0ce80 100644 --- 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 { diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 3cc6bee38604..2e963725a3b9 100644 --- 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) \ )) diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index f4c04a0e7a55..d0afa62ca337 100644 --- 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" diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk index e8e5a01f6531..33d78aa8eb38 100644 --- 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 \ diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index 3ececdd9eb84..4c2e77ed0bcf 100644 --- 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 \ diff --git a/connectivity/CppunitTest_connectivity_mork.mk b/connectivity/CppunitTest_connectivity_mork.mk index 68420d9249ac..f4e31d52dc49 100644 --- 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 \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 2d65ea9de9c6..7678f2ec1d94 100644 --- 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) \ )) diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index a5bc6e78e71e..153db8f9b299 100644 --- 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 \ diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index 7c0fe61bddf8..167a63a99bc5 100644 --- 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) \ )) diff --git a/connectivity/inc/pch/precompiled_file.hxx b/connectivity/inc/pch/precompiled_file.hxx index 18e25b4c7eef..16451d0228de 100644 --- 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> diff --git a/connectivity/inc/pch/precompiled_flat.hxx b/connectivity/inc/pch/precompiled_flat.hxx index e83aa35ffe9c..cc508756e1e2 100644 --- 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> diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index a354ab9aafb0..f079083150bd 100644 --- 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> diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index beea43d3b8b7..1712d5a00918 100644 --- 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" diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 781a49eca7fb..570dab66ec84 100644 --- 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> diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 695c59375b74..9126a81f9394 100644 --- 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> diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 57c394eee39e..51a5861d01d4 100644 --- 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 \ diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index b46608008abb..3ab4ba55be20 100644 --- 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> diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index c5e8609cbec5..7a0bfaec7dbd 100644 --- 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 \ diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 0be71ef9c33d..54a5c1ac78fe 100644 --- 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> diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 6e04e19076ea..56b0185a4b8d 100644 --- 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> diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 50bfe4da92a5..66984ca99375 100644 --- 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> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index d9f214684eff..d495a243231d 100644 --- 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> diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index d2e3a11dbb5d..934f0c841b20 100644 --- 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> diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index d7e68f85a029..8d5bbb198cc9 100644 --- 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> diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 67dce8106e7e..f208845d5e46 100644 --- 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> diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index f7c8aab03be7..f0a6e2d24d8d 100644 --- 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> diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 4db6c7183576..24cdf3a3bec5 100644 --- 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 \ diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 2ed400957d1c..d8f40b751170 100644 --- 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 \ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index fbb385dd37f8..697a9100668f 100644 --- 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 \ diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index 7c082adce3f3..4826fec1d02b 100644 --- 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> diff --git a/dbaccess/source/core/misc/userinformation.cxx b/dbaccess/source/core/misc/userinformation.cxx index fc4e96a0e6ad..5ab2f2ac4a8b 100644 --- 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; diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 9ba2dd768061..fb40398f4757 100644 --- 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" diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index dc30097c9511..65596afb6095 100644 --- 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) \ )) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 0dfa88f0e016..ec90d2196742 100644 --- 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 \ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index f0c01dc69dd6..c0952575c0b9 100644 --- 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) \ )) diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 89b73d3bb43f..7fd2a895df77 100644 --- 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 \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 5ae66d259d30..a82d2da2756b 100644 --- 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 \ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 8f79d0ffe64d..b078da4b7a19 100644 --- 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) \ )) diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk index 450db2640564..e320d1b70686 100644 --- 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 \ diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 5ac1b0962201..09f0ef901497 100644 --- 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> diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 2a0aba9b8b5d..4a5bb4ed9490 100644 --- 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> diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index f81bf57f097b..38abdb675e65 100644 --- 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" diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 2dc584f79696..ccd57d20e1d5 100644 --- 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" diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index 9f918780db41..78bf42624b8e 100644 --- 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" diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index c7acb758b95d..0100632c36a5 100644 --- 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; diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 56400e0b81a6..cc4eb29f9463 100644 --- 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> diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index 4340e9f8c30a..f063cf6c1e92 100644 --- 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" diff --git a/dictionaries b/dictionaries -Subproject 26b7c425b0cecaad38249bfdc17b8d5cecee267 +Subproject 36776c334cf3bae5bdd5929fad8e11a8bdf830a diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index daa522a59b55..83058faddbff 100644 --- 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 \ diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx index 690924f6f4bd..5dea3b450c19 100644 --- 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> diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 5ef492915a29..3051968dca9e 100644 --- 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> diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 664099935227..69f042e4b0b1 100644 --- 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> diff --git a/drawinglayer/source/processor2d/getdigitlanguage.cxx b/drawinglayer/source/processor2d/getdigitlanguage.cxx index 012b39c08002..118b487442c7 100644 --- 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" diff --git a/drawinglayer/source/processor2d/getdigitlanguage.hxx b/drawinglayer/source/processor2d/getdigitlanguage.hxx index 1f186f645be2..984000c69fb1 100644 --- 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 { diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index c8547109b6fe..354b9cfad092 100644 --- 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) \ )) diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index d8ede2ea322d..fb43b8ecae64 100644 --- 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 \ diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk index 1574558e304a..4b0ebdb3224a 100644 --- 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) \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index d21e9a1d0729..bab7ffec4c86 100644 --- 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) \ )) diff --git a/editeng/inc/editeng/SpellPortions.hxx b/editeng/inc/editeng/SpellPortions.hxx index cbfe086b8670..d8ca7f924b7f 100644 --- 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> diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx index 6161671457c2..83ba64342443 100644 --- 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 diff --git a/editeng/inc/editeng/editstat.hxx b/editeng/inc/editeng/editstat.hxx index ac45a7fe5d0f..175267938c91 100644 --- 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. diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx index e84224ad4b43..f3cad0e4c99f 100644 --- 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> diff --git a/editeng/inc/editeng/edtdlg.hxx b/editeng/inc/editeng/edtdlg.hxx index 6dda1344266e..40cdd5d9b35a 100644 --- 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> diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx index d3f2b366d02f..8f75e0c2e6b2 100644 --- 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> diff --git a/editeng/inc/editeng/hangulhanja.hxx b/editeng/inc/editeng/hangulhanja.hxx index d88d39284509..4381d756eabe 100644 --- 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 diff --git a/editeng/inc/editeng/langitem.hxx b/editeng/inc/editeng/langitem.hxx index ff78d9d60139..8a649741c435 100644 --- 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; diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index 7df693be96ea..9f9c4190d264 100644 --- 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> diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx index 26d1ae5bb88e..f74c2f7a2338 100644 --- a/editeng/inc/editeng/svxacorr.hxx +++ b/editeng/inc/editeng/svxacorr.hxx @@ -24,7 +24,7 @@ #include <o3tl/sorted_vector.hxx> #include <tools/rtti.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/time.hxx> #include <tools/date.hxx> #include <tools/string.hxx> diff --git a/editeng/inc/editeng/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx index ec4e77a93778..858157453aa1 100644 --- a/editeng/inc/editeng/svxfont.hxx +++ b/editeng/inc/editeng/svxfont.hxx @@ -21,7 +21,7 @@ #include <limits.h> // USHRT_MAX #include <editeng/svxenum.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <vcl/font.hxx> #include "editeng/editengdllapi.h" diff --git a/editeng/inc/editeng/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx index bb5044cc3e70..9e5bba23e56b 100644 --- a/editeng/inc/editeng/unoedsrc.hxx +++ b/editeng/inc/editeng/unoedsrc.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/accessibility/TextSegment.hpp> #include <tools/solar.h> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/gen.hxx> #include <vcl/mapmod.hxx> #include <tools/string.hxx> diff --git a/editeng/inc/editeng/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx index afbaec26b85e..09f570228f95 100644 --- a/editeng/inc/editeng/unolingu.hxx +++ b/editeng/inc/editeng/unolingu.hxx @@ -20,7 +20,7 @@ #ifndef _UNO_LINGU_HXX #define _UNO_LINGU_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/string.hxx> #include <com/sun/star/util/Language.hpp> #include <com/sun/star/linguistic2/XLinguServiceManager2.hpp> diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 27c9716a3aa0..57d1434f8e67 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -67,7 +67,7 @@ #include <editeng/bulletitem.hxx> #include <editeng/unolingu.hxx> #include <linguistic/lngprops.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <rtl/strbuf.hxx> #include <vcl/help.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index d992a1fe90ad..7a2f349960ad 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/i18n/WordType.hpp> #include <vcl/metric.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <svl/languageoptions.hxx> #include <svtools/ctrltool.hxx> #include <svtools/langtab.hxx> @@ -46,7 +46,7 @@ #include <eerdll2.hxx> #include <editeng.hrc> #include <helpid.hrc> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <vcl/menu.hxx> #include <vcl/window.hxx> #include <editeng/acorrcfg.hxx> diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 539be939aa22..87a3d4b77493 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -48,7 +48,7 @@ #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <rtl/ref.hxx> #include <boost/noncopyable.hpp> diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index dbaf736ff030..896179146d58 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -66,7 +66,7 @@ #include <com/sun/star/i18n/InputSequenceChecker.hpp> #include <com/sun/star/text/CharacterCompressionType.hpp> #include <vcl/pdfextoutdevdata.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 1e4ffdb59f4b..f96d83eef2ed 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -34,7 +34,7 @@ #include <editeng/editview.hxx> #include <eehtml.hxx> #include <editobj2.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include "editxml.hxx" diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index cbc0272c9379..87134db022bc 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -37,7 +37,7 @@ #include <tools/tenccvt.hxx> #include <rtl/ustring.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <svl/itemset.hxx> #include <svtools/langtab.hxx> diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index cdc9d2ef13ef..fe5981eb5153 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/lang/Locale.hpp> #include <tools/urlobj.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <vcl/svapp.hxx> #include <sot/storinfo.hxx> #include <svl/fstathelper.hxx> diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index e5b95169f076..64f65dbe1e59 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -42,7 +42,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase1.hxx> // helper for implementations -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/lingucfg.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/localfilehelper.hxx> diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 015dd35d7a10..d6c07e38e6e4 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -28,7 +28,7 @@ #include <editeng/fhgtitem.hxx> #include <svl/style.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #define _OUTLINER_CXX #include <editeng/outliner.hxx> diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index c8d0570b021c..3d9a75311aaf 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -87,7 +87,7 @@ $(eval $(call gb_Library_use_libraries,abp,\ tl \ utl \ vcl \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index d12adecf10d3..01664557dc8e 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -76,7 +76,7 @@ $(eval $(call gb_Library_use_libraries,bib,\ cppu \ sal \ salhelper \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index 42ea5a087808..51c2953211fe 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -72,7 +72,7 @@ $(eval $(call gb_Library_use_libraries,dbp,\ cppu \ sal \ salhelper \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 2dde30a4d916..243be5ffc9ce 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -51,7 +51,7 @@ $(eval $(call gb_Library_use_libraries,pcr,\ utl \ tl \ dbtools \ - i18nisolang1 \ + i18nlangtag \ comphelper \ cppuhelper \ cppu \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index e713a55e2f75..7bc69cfb6eb9 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_sdk_api,res)) $(eval $(call gb_Library_use_libraries,res,\ vcl \ - i18nisolang1 \ + i18nlangtag \ tl \ comphelper \ cppu \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index be21b7875195..4b0c688d800a 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,scn,\ cppuhelper \ cppu \ sal \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk index bc3cdc58ca37..90a7443d6be4 100644 --- a/extensions/Library_updatecheckui.mk +++ b/extensions/Library_updatecheckui.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,updatecheckui,\ cppuhelper \ cppu \ sal \ - i18nisolang1 \ + i18nlangtag \ )) $(eval $(call gb_Library_add_exception_objects,updatecheckui,\ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index e5b27af4cdf6..858e49300978 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -35,7 +35,7 @@ $(eval $(call gb_StaticLibrary_use_packages,plugcon,\ basegfx_inc \ comphelper_inc \ cppu_odk_headers \ - i18npool_inc \ + i18nlangtag_inc \ np_sdk_inc \ o3tl_inc \ rsc_inc \ diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index b90a4a11b4dc..fcaa26b30224 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -41,7 +41,7 @@ #include <svtools/colorcfg.hxx> #include <unotools/syslocale.hxx> #include <unotools/datetime.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <vcl/button.hxx> #include <vcl/svapp.hxx> //================================================================== diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index ea757b89569e..908213344520 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_use_libraries,eps,\ vcl \ utl \ tl \ - i18nisolang1 \ + i18nlangtag \ cppu \ sal \ $(gb_UWINAPI) \ diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index 577167df5172..1fb26486541a 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\ cppu \ sal \ salhelper \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index d3fc3309562e..f3ea2733d123 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_use_libraries,flash,\ vcl \ utl \ tl \ - i18nisolang1 \ + i18nlangtag \ comphelper \ basegfx \ cppuhelper \ diff --git a/filter/Library_graphicfilter.mk b/filter/Library_graphicfilter.mk index 223121e48844..b4201f1d8985 100644 --- a/filter/Library_graphicfilter.mk +++ b/filter/Library_graphicfilter.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,graphicfilter,\ utl \ tl \ svl \ - i18nisolang1 \ + i18nlangtag \ comphelper \ basegfx \ cppuhelper \ diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index e1fb40af6ec1..b3a62d76f352 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\ utl \ tl \ svl \ - i18nisolang1 \ + i18nlangtag \ comphelper \ basegfx \ cppuhelper \ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index b635c8850f51..8bbdd6051fc2 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ svl \ utl \ tl \ - i18nisolang1 \ + i18nlangtag \ sax \ comphelper \ basegfx \ diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index dae8f629737d..8e7081f300c7 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_use_libraries,t602filter,\ cppuhelper \ cppu \ sal \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 0c59e013e13b..6e31333bbc84 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\ svl \ utl \ tl \ - i18nisolang1 \ + i18nlangtag \ comphelper \ cppuhelper \ cppu \ diff --git a/filter/inc/filter/msfilter/countryid.hxx b/filter/inc/filter/msfilter/countryid.hxx index 5b1792b28616..b70f649b05c3 100644 --- a/filter/inc/filter/msfilter/countryid.hxx +++ b/filter/inc/filter/msfilter/countryid.hxx @@ -23,7 +23,7 @@ #define INCLUDED_SVX_COUNTRYID_HXX #include <sal/types.h> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include "filter/msfilter/msfilterdllapi.h" // ---------------------------------------------------------------------------- diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 2ca1296c7490..9551329ee875 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -48,7 +48,7 @@ #include <rtl/uri.hxx> #include <tools/urlobj.hxx> #include <tools/wldcrd.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <comphelper/configurationhelper.hxx> diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 4b952c48c6b4..f26f1f80b3fa 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -38,7 +38,7 @@ #include <editeng/flditem.hxx> #include <editeng/numitem.hxx> #include <comphelper/processfactory.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <svl/zforlist.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/animationexport.hxx> diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index c7b0f5e2ca26..8ec6f0b69559 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,frm,\ cppuhelper \ dbtools \ editeng \ - i18nisolang1 \ + i18nlangtag \ sal \ salhelper \ sfx \ diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 42ed48f2795d..d217a80f28dc 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -34,7 +34,7 @@ #include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <tools/wintypes.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <rtl/textenc.h> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/util/NumberFormat.hpp> diff --git a/formula/Library_for.mk b/formula/Library_for.mk index 9145f5235de2..d7464877d97d 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,for,\ cppu \ cppuhelper \ sal \ - i18nisolang1 \ + i18nlangtag \ svl \ svt \ tl \ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 0706a40a28bc..757337343fb4 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_libraries,forui,\ tl \ utl \ vcl \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 6311b856b00c..ed9cac4b236b 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -51,7 +51,7 @@ $(eval $(call gb_Library_use_libraries,fps,\ cppu \ cppuhelper \ sal \ - i18nisolang1 \ + i18nlangtag \ tl \ utl \ vcl \ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index ada788d6cf32..bd1f0bbe6efe 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,fps_aqua,\ $(eval $(call gb_Library_use_libraries,fps_aqua,\ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ sal \ tl \ vcl \ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index f9c69ea7484b..f94453e15f40 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ ucbhelper \ utl \ vcl \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 9fd6ec8b0824..482dac4dfc99 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,fwe,\ cppuhelper \ fwi \ sal \ - i18nisolang1 \ + i18nlangtag \ svl \ svt \ tl \ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 150bd0c56342..6fcd6d2023a3 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,fwi,\ comphelper \ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ sal \ svl \ svt \ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index bf9a3970936c..b1b1660f96d5 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_libraries,fwk,\ cppuhelper \ fwe \ fwi \ - i18nisolang1 \ + i18nlangtag \ sal \ sot \ svl \ diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 1ef509946574..fb8b3856771d 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_libraries,fwl,\ cppuhelper \ fwe \ fwi \ - i18nisolang1 \ + i18nlangtag \ sal \ svl \ svt \ diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index f74f69ae907b..2db48ff6d9b9 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -30,7 +30,7 @@ #include <cppuhelper/implbase1.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <svl/languageoptions.hxx> #include <rtl/ustring.hxx> #include <fwidllapi.h> diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index 532ba184191c..65ebcc30039d 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -43,7 +43,7 @@ #include <rtl/ustring.hxx> #include <unotools/configitem.hxx> #include <tools/link.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> namespace framework { diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 9ef571f4086f..82ffbe68c471 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/xml/sax/XParser.hpp> #include <comphelper/sequenceashashmap.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> namespace framework diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 83890281725b..dd3e35594761 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/util/XChangesNotifier.hpp> #include <vcl/svapp.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <comphelper/configurationhelper.hxx> diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 304f92faca4f..39b9773d9c2a 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -38,7 +38,7 @@ #include <vcl/svapp.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #define SUBSTORAGE_GLOBAL DECLARE_ASCII("global" ) diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx index 5245808255c8..b8a43a8868fb 100644 --- a/framework/source/fwi/helper/mischelper.cxx +++ b/framework/source/fwi/helper/mischelper.cxx @@ -28,7 +28,7 @@ #include <tools/debug.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <svtools/langtab.hxx> #include <comphelper/processfactory.hxx> #include <helper/mischelper.hxx> diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index d5325f9cf093..19853be14932 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -31,7 +31,7 @@ #include <comphelper/processfactory.hxx> #include <salhelper/singletonref.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> namespace framework { diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index e26f99a55ec1..cdb13abebaf3 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -34,7 +34,7 @@ #include <osl/security.hxx> #include <osl/socket.hxx> #include <osl/process.h> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/urlobj.hxx> #include <tools/resmgr.hxx> #include <tools/wldcrd.hxx> diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index e3e3669f05a3..eb6ad5b1ee22 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <svl/languageoptions.hxx> #include <svtools/langtab.hxx> #include <classes/fwlresid.hxx> diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 5c87d7a6d52e..cf9b635b998e 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -37,7 +37,7 @@ #include "sal/types.h" #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/document/XDocumentLanguages.hpp> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/frame/XModule.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/helpcontent2 b/helpcontent2 -Subproject 2e1a9cae55c82ba0faefc4b7d41b902e90ec6c2 +Subproject 368e41dfa3f5f1d0cd04c9605cf36db49b9d03b diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk new file mode 100644 index 000000000000..0bed7f56468f --- /dev/null +++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk @@ -0,0 +1,49 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,i18nlangtag_test_languagetag)) + +$(eval $(call gb_CppunitTest_use_api,i18nlangtag_test_languagetag,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_CppunitTest_use_library_objects,i18nlangtag_test_languagetag,i18nlangtag)) + +$(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\ + cppu \ + cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +ifeq ($(ENABLE_LIBLANGTAG),YES) +$(eval $(call gb_CppunitTest_use_externals,i18nlangtag_test_languagetag,\ + liblangtag \ + libxml2 \ +)) +$(eval $(call gb_CppunitTest_add_defs,i18nlangtag_test_languagetag,-DENABLE_LIBLANGTAG)) + +ifeq ($(SYSTEM_LIBLANGTAG),YES) +$(eval $(call gb_CppunitTest_add_defs,i18nlangtag_test_languagetag,-DSYSTEM_LIBLANGTAG)) +else +$(eval $(call gb_CppunitTest_use_package,i18nlangtag_test_languagetag,langtag_data)) +endif +endif + +$(eval $(call gb_CppunitTest_set_include,i18nlangtag_test_languagetag,\ + -I$(SRCDIR)/i18nlangtag/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,i18nlangtag_test_languagetag,\ + i18nlangtag/qa/cppunit/test_languagetag \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/i18npool/Library_i18nisolang1.mk b/i18nlangtag/Library_i18nlangtag.mk index d487f924e2ab..2f5efa0d7d55 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18nlangtag/Library_i18nlangtag.mk @@ -26,42 +26,42 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Library_Library,i18nisolang1)) +$(eval $(call gb_Library_Library,i18nlangtag)) -$(eval $(call gb_Library_use_packages,i18nisolang1,\ +$(eval $(call gb_Library_use_packages,i18nlangtag,\ cppu_odk_headers \ - i18npool_inc \ + i18nlangtag_inc \ )) -$(eval $(call gb_Library_set_include,i18nisolang1,\ - -I$(SRCDIR)/i18npool/inc \ +$(eval $(call gb_Library_set_include,i18nlangtag,\ + -I$(SRCDIR)/i18nlangtag/inc \ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_sdk_api,i18nisolang1)) +$(eval $(call gb_Library_use_sdk_api,i18nlangtag)) -$(eval $(call gb_Library_add_defs,i18nisolang1,\ - -DI18NISOLANG_DLLIMPLEMENTATION \ +$(eval $(call gb_Library_add_defs,i18nlangtag,\ + -DI18NLANGTAG_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_libraries,i18nisolang1,\ +$(eval $(call gb_Library_use_libraries,i18nlangtag,\ sal \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_exception_objects,i18nisolang1,\ - i18npool/source/isolang/insys \ - i18npool/source/isolang/isolang \ - i18npool/source/isolang/mslangid \ - i18npool/source/languagetag/languagetag \ +$(eval $(call gb_Library_add_exception_objects,i18nlangtag,\ + i18nlangtag/source/isolang/insys \ + i18nlangtag/source/isolang/isolang \ + i18nlangtag/source/isolang/mslangid \ + i18nlangtag/source/languagetag/languagetag \ )) ifeq ($(ENABLE_LIBLANGTAG),YES) -$(eval $(call gb_Library_add_defs,i18nisolang1,-DENABLE_LIBLANGTAG)) -$(eval $(call gb_Library_use_external,i18nisolang1,liblangtag)) -$(eval $(call gb_Library_use_external,i18nisolang1,libxml2)) -$(eval $(call gb_Library_use_system_win32_libs,i18nisolang1,\ +$(eval $(call gb_Library_add_defs,i18nlangtag,-DENABLE_LIBLANGTAG)) +$(eval $(call gb_Library_use_external,i18nlangtag,liblangtag)) +$(eval $(call gb_Library_use_external,i18nlangtag,libxml2)) +$(eval $(call gb_Library_use_system_win32_libs,i18nlangtag,\ $(if $(filter $(COM),MSC), \ kernel32 \ ) \ diff --git a/i18nlangtag/Makefile b/i18nlangtag/Makefile new file mode 100644 index 000000000000..0997e628485b --- /dev/null +++ b/i18nlangtag/Makefile @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/i18nlangtag/Module_i18nlangtag.mk b/i18nlangtag/Module_i18nlangtag.mk new file mode 100644 index 000000000000..c16f50f4576a --- /dev/null +++ b/i18nlangtag/Module_i18nlangtag.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +$(eval $(call gb_Module_Module,i18nlangtag)) + +$(eval $(call gb_Module_add_targets,i18nlangtag,\ + Library_i18nlangtag \ + Package_inc \ +)) + +$(eval $(call gb_Module_add_check_targets,i18nlangtag,\ + CppunitTest_i18nlangtag_test_languagetag \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/i18npool/Package_inc.mk b/i18nlangtag/Package_inc.mk index 140edc92d160..984faf4e21b3 100644 --- a/i18npool/Package_inc.mk +++ b/i18nlangtag/Package_inc.mk @@ -26,11 +26,11 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Package_Package,i18npool_inc,$(SRCDIR)/i18npool/inc)) +$(eval $(call gb_Package_Package,i18nlangtag_inc,$(SRCDIR)/i18nlangtag/inc)) -$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/i18npooldllapi.h,i18npool/i18npooldllapi.h)) -$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/lang.h,i18npool/lang.h)) -$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/languagetag.hxx,i18npool/languagetag.hxx)) -$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/mslangid.hxx,i18npool/mslangid.hxx)) +$(eval $(call gb_Package_add_file,i18nlangtag_inc,inc/i18nlangtag/i18nlangtagdllapi.h,i18nlangtag/i18nlangtagdllapi.h)) +$(eval $(call gb_Package_add_file,i18nlangtag_inc,inc/i18nlangtag/lang.h,i18nlangtag/lang.h)) +$(eval $(call gb_Package_add_file,i18nlangtag_inc,inc/i18nlangtag/languagetag.hxx,i18nlangtag/languagetag.hxx)) +$(eval $(call gb_Package_add_file,i18nlangtag_inc,inc/i18nlangtag/mslangid.hxx,i18nlangtag/mslangid.hxx)) # vim: set noet sw=4 ts=4: diff --git a/i18nlangtag/README b/i18nlangtag/README new file mode 100644 index 000000000000..88ca43bb965b --- /dev/null +++ b/i18nlangtag/README @@ -0,0 +1,3 @@ +Code for language tags, LanguageTag wrapper for liblangtag and converter between BCP47 language tags, Locale(Language,Country,Variant) and MS-LangIDs. + +Basic functionality used by almost every other module including comphelper, so even don't use that string helpers in this code to not create circular dependencies. Stick with sal! diff --git a/i18npool/inc/i18npool/i18npooldllapi.h b/i18nlangtag/inc/i18nlangtag/i18nlangtagdllapi.h index b049a5958174..ba9af35c08fe 100644 --- a/i18npool/inc/i18npool/i18npooldllapi.h +++ b/i18nlangtag/inc/i18nlangtag/i18nlangtagdllapi.h @@ -17,25 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_I18NPOOL_I18NPOOLDLLAPI_H -#define INCLUDED_I18NPOOL_I18NPOOLDLLAPI_H +#ifndef INCLUDED_I18NLANGTAG_I18NLANGTAGDLLAPI_H +#define INCLUDED_I18NLANGTAG_I18NLANGTAGDLLAPI_H #include "sal/types.h" -#if defined(I18NPAPER_DLLIMPLEMENTATION) -#define I18NPAPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#if defined(I18NLANGTAG_DLLIMPLEMENTATION) +#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define I18NPAPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#define I18NPAPER_DLLPRIVATE SAL_DLLPRIVATE +#define I18NLANGTAG_DLLPRIVATE SAL_DLLPRIVATE -#if defined(I18NISOLANG_DLLIMPLEMENTATION) -#define I18NISOLANG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -#else -#define I18NISOLANG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT -#endif -#define I18NISOLANG_DLLPRIVATE SAL_DLLPRIVATE - -#endif /* INCLUDED_I18NPOOL_I18NPOOLDLLAPI_H */ +#endif /* INCLUDED_I18NLANGTAG_I18NLANGTAGDLLAPI_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/inc/i18npool/lang.h b/i18nlangtag/inc/i18nlangtag/lang.h index 81a6d87f74c9..d4f5ca7a61b3 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18nlangtag/inc/i18nlangtag/lang.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_I18NPOOL_LANG_H -#define INCLUDED_I18NPOOL_LANG_H +#ifndef INCLUDED_I18NLANGTAG_LANG_H +#define INCLUDED_I18NLANGTAG_LANG_H /** These are MS LANGIDs, the lower 10 bits (mask 0x03ff, values below 0x0400 @@ -395,7 +395,7 @@ typedef unsigned short LanguageType; * * Obsolete OOo user defines now have other values assigned by MS, and * different name. Mapping an obsolete value to ISO code should work provided - * that such a mapping exists in i18npool/source/isolang/isolang.cxx, but + * that such a mapping exists in i18nlangtag/source/isolang/isolang.cxx, but * mapping ISO back to LANGID will return the new value. */ #define LANGUAGE_OBSOLETE_USER_LATIN 0x0610 @@ -563,6 +563,6 @@ typedef unsigned short LanguageType; #define LANGUAGE_UNDETERMINED 0xFFF0 /* undetermined language, primary 0x3f0, sub 0x3f */ #define LANGUAGE_USER_SYSTEM_CONFIG 0xFFFE /* not a locale, to be used only in configuration context to obtain system default, primary 0x3fe, sub 0x3f */ -#endif /* INCLUDED_I18NPOOL_LANG_H */ +#endif /* INCLUDED_I18NLANGTAG_LANG_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/inc/i18npool/languagetag.hxx b/i18nlangtag/inc/i18nlangtag/languagetag.hxx index c3d605571c90..e5ba011ab2ba 100644 --- a/i18npool/inc/i18npool/languagetag.hxx +++ b/i18nlangtag/inc/i18nlangtag/languagetag.hxx @@ -7,14 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_I18NPOOL_LANGUAGETAG_HXX -#define INCLUDED_I18NPOOL_LANGUAGETAG_HXX +#ifndef INCLUDED_I18NLANGTAG_LANGUAGETAG_HXX +#define INCLUDED_I18NLANGTAG_LANGUAGETAG_HXX #include <sal/config.h> #include <rtl/ustring.hxx> #include <com/sun/star/lang/Locale.hpp> -#include <i18npool/i18npooldllapi.h> -#include <i18npool/lang.h> +#include <i18nlangtag/i18nlangtagdllapi.h> +#include <i18nlangtag/lang.h> #include <vector> @@ -28,7 +28,7 @@ typedef struct _rtl_Locale rtl_Locale; // as in rtl/locale.h const methods. Getter methods return either the original value or matching converted values. */ -class I18NISOLANG_DLLPUBLIC LanguageTag +class I18NLANGTAG_DLLPUBLIC LanguageTag { public: @@ -395,6 +395,6 @@ private: OUString& rCountry ); }; -#endif // INCLUDED_I18NPOOL_LANGUAGETAG_HXX +#endif // INCLUDED_I18NLANGTAG_LANGUAGETAG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18nlangtag/inc/i18nlangtag/mslangid.hxx index ce4ca47d01f1..8148d1760de0 100644 --- a/i18npool/inc/i18npool/mslangid.hxx +++ b/i18nlangtag/inc/i18nlangtag/mslangid.hxx @@ -17,18 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_I18NISOLANG_MSLANGID_HXX -#define INCLUDED_I18NISOLANG_MSLANGID_HXX +#ifndef INCLUDED_I18NLANGTAG_MSLANGID_HXX +#define INCLUDED_I18NLANGTAG_MSLANGID_HXX #include <sal/config.h> -#include "i18npool/i18npooldllapi.h" -#include "i18npool/lang.h" +#include "i18nlangtag/i18nlangtagdllapi.h" +#include "i18nlangtag/lang.h" #include <com/sun/star/lang/Locale.hpp> /** Methods related to Microsoft language IDs. For details about MS-LANGIDs please see lang.h */ -class I18NISOLANG_DLLPUBLIC MsLangId +class I18NLANGTAG_DLLPUBLIC MsLangId { public: @@ -182,7 +182,7 @@ public: sal_Char maCountry[3]; /** Obtain a language tag string with '-' separator. */ - I18NISOLANG_DLLPUBLIC OUString getTagString() const; + I18NLANGTAG_DLLPUBLIC OUString getTagString() const; }; /** @internal - Return a pointer to the IsoLangEntry of the underlying table, @@ -215,20 +215,20 @@ public: /** Convert a Locale to a LanguageType with handling of an empty language name designating LANGUAGE_SYSTEM. */ - I18NISOLANG_DLLPRIVATE static LanguageType convertLocaleToLanguage( + I18NLANGTAG_DLLPRIVATE static LanguageType convertLocaleToLanguage( const ::com::sun::star::lang::Locale & rLocale ); /** Convert x-... privateuse, used by convertLocaleToLanguage(Locale) */ - I18NISOLANG_DLLPRIVATE static LanguageType convertPrivateUseToLanguage( + I18NLANGTAG_DLLPRIVATE static LanguageType convertPrivateUseToLanguage( const OUString& rPriv ); /** Used by convertLocaleToLanguage(Locale) */ - I18NISOLANG_DLLPRIVATE static LanguageType convertIsoNamesToLanguage( + I18NLANGTAG_DLLPRIVATE static LanguageType convertIsoNamesToLanguage( const OUString& rLang, const OUString& rCountry ); /** Used by convertUnxByteStringToLanguage(OString) */ - I18NISOLANG_DLLPRIVATE static LanguageType convertIsoNamesToLanguage( + I18NLANGTAG_DLLPRIVATE static LanguageType convertIsoNamesToLanguage( const OString& rLang, const OString& rCountry ); @@ -239,24 +239,24 @@ public: If bResolveSystem==false, a LANGUAGE_SYSTEM results in an empty Locale. */ - I18NISOLANG_DLLPRIVATE static ::com::sun::star::lang::Locale convertLanguageToLocale( + I18NLANGTAG_DLLPRIVATE static ::com::sun::star::lang::Locale convertLanguageToLocale( LanguageType nLang, bool bResolveSystem ); /** Convert a LanguageType to a Locale, resolving LANGUAGE_SYSTEM. Used by convertLanguageToLocale(LanguageType,bool) */ - I18NISOLANG_DLLPRIVATE static void convertLanguageToLocale( + I18NLANGTAG_DLLPRIVATE static void convertLanguageToLocale( LanguageType nLang, ::com::sun::star::lang::Locale & rLocale ); /** Used by convertLanguageToLocale(LanguageType,Locale) */ - I18NISOLANG_DLLPRIVATE static void convertLanguageToIsoNames( + I18NLANGTAG_DLLPRIVATE static void convertLanguageToIsoNames( LanguageType nLang, OUString& rLangStr, OUString& rCountry ); - I18NISOLANG_DLLPRIVATE static LanguageType lookupFallbackLanguage( LanguageType nLang ); + I18NLANGTAG_DLLPRIVATE static LanguageType lookupFallbackLanguage( LanguageType nLang ); - I18NISOLANG_DLLPRIVATE static ::com::sun::star::lang::Locale lookupFallbackLocale( + I18NLANGTAG_DLLPRIVATE static ::com::sun::star::lang::Locale lookupFallbackLocale( const ::com::sun::star::lang::Locale & rLocale ); @@ -265,11 +265,11 @@ public: Used by getFallbackLocale(Locale) */ - I18NISOLANG_DLLPRIVATE static ::com::sun::star::lang::Locale convertLanguageToLocaleWithFallback( + I18NLANGTAG_DLLPRIVATE static ::com::sun::star::lang::Locale convertLanguageToLocaleWithFallback( LanguageType nLang ); /** Used by convertLanguageToLocaleWithFallback(LanguageType) */ - I18NISOLANG_DLLPRIVATE static ::com::sun::star::lang::Locale lookupFallbackLocale( + I18NLANGTAG_DLLPRIVATE static ::com::sun::star::lang::Locale lookupFallbackLocale( LanguageType nLang ); }; @@ -287,7 +287,7 @@ private: // Substitute LANGUAGE_SYSTEM for LANGUAGE_SYSTEM_DEFAULT and // LANGUAGE_PROCESS_OR_USER_DEFAULT, other values aren't touched. - I18NISOLANG_DLLPRIVATE static inline LanguageType simplifySystemLanguages( LanguageType nLang ); + I18NLANGTAG_DLLPRIVATE static inline LanguageType simplifySystemLanguages( LanguageType nLang ); }; @@ -304,6 +304,6 @@ inline LanguageType MsLangId::getSystemUILanguage() return getPlatformSystemUILanguage(); } -#endif // INCLUDED_I18NISOLANG_MSLANGID_HXX +#endif // INCLUDED_I18NLANGTAG_MSLANGID_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 4e57b39a791a..c64d199fc0e4 100644 --- a/i18npool/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -14,8 +14,8 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/i18npool/source/isolang/insys.cxx b/i18nlangtag/source/isolang/insys.cxx index a0f1ab496c4d..a0f1ab496c4d 100644 --- a/i18npool/source/isolang/insys.cxx +++ b/i18nlangtag/source/isolang/insys.cxx diff --git a/i18npool/source/isolang/inunx.cxx b/i18nlangtag/source/isolang/inunx.cxx index 005421c76c18..f47bfa4b67c2 100644 --- a/i18npool/source/isolang/inunx.cxx +++ b/i18nlangtag/source/isolang/inunx.cxx @@ -30,8 +30,8 @@ #endif // MACOSX #include <rtl/instance.hxx> -#include "i18npool/languagetag.hxx" -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/languagetag.hxx" +#include "i18nlangtag/mslangid.hxx" // ======================================================================= diff --git a/i18npool/source/isolang/inwnt.cxx b/i18nlangtag/source/isolang/inwnt.cxx index 07661bdc1ce0..c0971673d1f3 100644 --- a/i18npool/source/isolang/inwnt.cxx +++ b/i18nlangtag/source/isolang/inwnt.cxx @@ -32,7 +32,7 @@ #pragma warning(pop) #endif #include <rtl/instance.hxx> -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" static LanguageType nImplSystemLanguage = LANGUAGE_DONTKNOW; static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW; diff --git a/i18npool/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 17a803343877..a6a467ce4671 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -22,7 +22,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" // ======================================================================= diff --git a/i18npool/source/isolang/langid.pl b/i18nlangtag/source/isolang/langid.pl index b57c93629aa8..4504f08eabed 100755 --- a/i18npool/source/isolang/langid.pl +++ b/i18nlangtag/source/isolang/langid.pl @@ -102,8 +102,8 @@ sub grepFile($$$$@) my $file; # Try module under current working directory first to catch local # modifications. A Not yet delivered lang.h is a special case. - if ("$path/$module/$name" eq "$SOLENVINC/i18npool/lang.h") { - $file = "./$module/inc/i18npool/lang.h"; } + if ("$path/$module/$name" eq "$SOLENVINC/i18nlangtag/lang.h") { + $file = "./$module/inc/i18nlangtag/lang.h"; } else { $file = "./$module/$name"; } if (!($found = open( IN, $file))) @@ -232,7 +232,7 @@ sub main() # #define LANGUAGE_AFRIKAANS 0x0436 @resultlist = grepFile( $modifier . '^\s*#\s*define\s+[A-Z_]*' . $grepdef, - $SOLENVINC, "i18npool", "lang.h", ()); + $SOLENVINC, "i18nlangtag", "lang.h", ()); } else { @@ -241,7 +241,7 @@ sub main() my $buf = sprintf( "0x%04X", $lcid); @resultlist = grepFile( '^\s*#\s*define\s+\w+\s+' . $buf, - $SOLENVINC, "i18npool", "lang.h", ()); + $SOLENVINC, "i18nlangtag", "lang.h", ()); } for $result (@resultlist) { @@ -270,7 +270,7 @@ sub main() # { LANGUAGE_AFRIKAANS, "af", "ZA" }, @resultlist = grepFile( '^\s*\{\s*\w+\s*,\s*\"' . $lang . '\"\s*,\s*\"' . $coun . '\"\s*\}\s*,', - "$SRC_ROOT", "i18npool", "source/isolang/isolang.cxx", ()); + "$SRC_ROOT", "i18nlangtag", "source/isolang/isolang.cxx", ()); for $result (@resultlist) { if ($result =~ /^\s*\{\s*(\w+)\s*,\s*\"\w+\"\s*,\s*\"(\w+)?\"\s*\}\s*,/) @@ -294,7 +294,7 @@ sub main() # #define LANGUAGE_AFRIKAANS 0x0436 @resultlist = grepFile( $modifier . '^\s*#\s*define\s+[A-Z_]*' . $grepdef, - $SOLENVINC, "i18npool", "lang.h", ()); + $SOLENVINC, "i18nlangtag", "lang.h", ()); my @lcidlist; for $result (@resultlist) { @@ -308,7 +308,7 @@ sub main() # { LANGUAGE_AFRIKAANS, "af", "ZA" }, @resultlist = grepFile( $modifier . '^\s*\{\s*.*' . $grepdef . '.*\s*,\s*\".*\"\s*,\s*\".*\"\s*\}\s*,', - "$SRC_ROOT", "i18npool", "source/isolang/isolang.cxx", ()); + "$SRC_ROOT", "i18nlangtag", "source/isolang/isolang.cxx", ()); my @langcoungreplist; for $result (@resultlist) @@ -363,7 +363,7 @@ sub main() # case LANGUAGE_ARABIC: grepFile( $modifier . '^\s*case\s*.*' . $grepdef . '.*\s*:', - "$SRC_ROOT", "i18npool", "source/isolang/mslangid.cxx", ()); + "$SRC_ROOT", "i18nlangtag", "source/isolang/mslangid.cxx", ()); # With CWS 'langstatusbar' the language listbox resource file gets a new location. my $module = "svx"; diff --git a/i18npool/source/isolang/lcid.awk b/i18nlangtag/source/isolang/lcid.awk index 371cd64106d6..db1a48d57ed8 100644 --- a/i18npool/source/isolang/lcid.awk +++ b/i18nlangtag/source/isolang/lcid.awk @@ -16,8 +16,8 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# Utility to compare MS-LANGID definitions with those defined in ../../inc/i18npool/lang.h -# Run in i18npool/source/isolang +# Utility to compare MS-LANGID definitions with those defined in ../../inc/i18nlangtag/lang.h +# Run in i18nlangtag/source/isolang # # outputs new #define LANGUAGE_... 0x... and also some commented out substrings # that were matched in already existing defines. @@ -70,7 +70,7 @@ # BEGIN { - while ((getline < "../../inc/i18npool/lang.h") > 0) + while ((getline < "../../inc/i18nlangtag/lang.h") > 0) { if ($0 ~ /^#define[ ]*LANGUAGE_[_A-Za-z0-9]*[ ]*0x[0-9a-fA-F]/) { diff --git a/i18npool/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx index 12cf5a3ad1da..8955f554007f 100644 --- a/i18npool/source/isolang/mslangid.cxx +++ b/i18nlangtag/source/isolang/mslangid.cxx @@ -22,7 +22,7 @@ #include <rtl/string.hxx> #include <com/sun/star/i18n/ScriptType.hpp> -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" LanguageType MsLangId::nConfiguredSystemLanguage = LANGUAGE_SYSTEM; diff --git a/i18npool/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index c93943d52362..e1eea3b75f04 100644 --- a/i18npool/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "i18npool/languagetag.hxx" -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/languagetag.hxx" +#include "i18nlangtag/mslangid.hxx" #include <rtl/ustrbuf.hxx> #include <rtl/bootstrap.hxx> #include <osl/file.hxx> @@ -108,7 +108,7 @@ LiblantagDataRef::~LiblantagDataRef() void LiblantagDataRef::setup() { - SAL_INFO( "i18npool.langtag", "LiblantagDataRef::setup: initializing database"); + SAL_INFO( "i18nlangtag", "LiblantagDataRef::setup: initializing database"); if (maDataPath.isEmpty()) setupDataPath(); lt_db_initialize(); @@ -118,7 +118,7 @@ void LiblantagDataRef::setup() void LiblantagDataRef::teardown() { - SAL_INFO( "i18npool.langtag", "LiblantagDataRef::teardown: finalizing database"); + SAL_INFO( "i18nlangtag", "LiblantagDataRef::teardown: finalizing database"); lt_db_finalize(); } @@ -490,7 +490,7 @@ bool LanguageTag::canonicalize() return true; // that's it } meIsLiblangtagNeeded = DECISION_YES; - SAL_INFO( "i18npool.langtag", "LanguageTag::canonicalize: using liblangtag for " << maBcp47); + SAL_INFO( "i18nlangtag", "LanguageTag::canonicalize: using liblangtag for " << maBcp47); if (!mpImplLangtag) { @@ -503,7 +503,7 @@ bool LanguageTag::canonicalize() if (lt_tag_parse( MPLANGTAG, OUStringToOString( maBcp47, RTL_TEXTENCODING_UTF8).getStr(), &aError.p)) { char* pTag = lt_tag_canonicalize( MPLANGTAG, &aError.p); - SAL_WARN_IF( !pTag, "i18npool.langtag", "LanguageTag::canonicalize: could not canonicalize " << maBcp47); + SAL_WARN_IF( !pTag, "i18nlangtag", "LanguageTag::canonicalize: could not canonicalize " << maBcp47); if (pTag) { OUString aOld( maBcp47); @@ -514,7 +514,7 @@ bool LanguageTag::canonicalize() { if (!lt_tag_parse( MPLANGTAG, pTag, &aError.p)) { - SAL_WARN( "i18npool.langtag", "LanguageTag::canonicalize: could not reparse " << maBcp47); + SAL_WARN( "i18nlangtag", "LanguageTag::canonicalize: could not reparse " << maBcp47); free( pTag); meIsValid = DECISION_NO; return false; @@ -527,7 +527,7 @@ bool LanguageTag::canonicalize() } else { - SAL_INFO( "i18npool.langtag", "LanguageTag::canonicalize: could not parse " << maBcp47); + SAL_INFO( "i18nlangtag", "LanguageTag::canonicalize: could not parse " << maBcp47); } meIsValid = DECISION_NO; return false; @@ -674,7 +674,7 @@ void LanguageTag::convertFromRtlLocale() mnLangID = MsLangId::convertUnxByteStringToLanguage( aStr); if (mnLangID == LANGUAGE_DONTKNOW) { - SAL_WARN( "i18npool.langtag", "LanguageTag(rtl_Locale) - unknown: " << aStr); + SAL_WARN( "i18nlangtag", "LanguageTag(rtl_Locale) - unknown: " << aStr); mnLangID = LANGUAGE_ENGLISH_US; // we need _something_ here } mbInitializedLangID = true; @@ -710,11 +710,11 @@ OUString LanguageTag::getLanguageFromLangtag() if (mpImplLangtag) { const lt_lang_t* pLangT = lt_tag_get_language( MPLANGTAG); - SAL_WARN_IF( !pLangT, "i18npool.langtag", "LanguageTag::getLanguageFromLangtag: pLangT==NULL"); + SAL_WARN_IF( !pLangT, "i18nlangtag", "LanguageTag::getLanguageFromLangtag: pLangT==NULL"); if (!pLangT) return aLanguage; const char* pLang = lt_lang_get_tag( pLangT); - SAL_WARN_IF( !pLang, "i18npool.langtag", "LanguageTag::getLanguageFromLangtag: pLang==NULL"); + SAL_WARN_IF( !pLang, "i18nlangtag", "LanguageTag::getLanguageFromLangtag: pLang==NULL"); if (pLang) aLanguage = OUString::createFromAscii( pLang); } @@ -741,7 +741,7 @@ OUString LanguageTag::getScriptFromLangtag() if (!pScriptT) return aScript; const char* pScript = lt_script_get_tag( pScriptT); - SAL_WARN_IF( !pScript, "i18npool.langtag", "LanguageTag::getScriptFromLangtag: pScript==NULL"); + SAL_WARN_IF( !pScript, "i18nlangtag", "LanguageTag::getScriptFromLangtag: pScript==NULL"); if (pScript) aScript = OUString::createFromAscii( pScript); } @@ -771,11 +771,11 @@ OUString LanguageTag::getRegionFromLangtag() SAL_WARN_IF( !pRegionT && maBcp47.getLength() != 2 && maBcp47.getLength() != 3 && maBcp47.getLength() != 7 && maBcp47.getLength() != 8, - "i18npool.langtag", "LanguageTag::getRegionFromLangtag: pRegionT==NULL"); + "i18nlangtag", "LanguageTag::getRegionFromLangtag: pRegionT==NULL"); if (!pRegionT) return aRegion; const char* pRegion = lt_region_get_tag( pRegionT); - SAL_WARN_IF( !pRegion, "i18npool.langtag", "LanguageTag::getRegionFromLangtag: pRegion==NULL"); + SAL_WARN_IF( !pRegion, "i18nlangtag", "LanguageTag::getRegionFromLangtag: pRegion==NULL"); if (pRegion) aRegion = OUString::createFromAscii( pRegion); } @@ -859,7 +859,7 @@ bool LanguageTag::isIsoLanguage( const OUString& rLanguage ) return true; SAL_WARN_IF( ((rLanguage.getLength() == 2 || rLanguage.getLength() == 3) && (isUpperAscii( rLanguage[0]) || isUpperAscii( rLanguage[1]))) || - (rLanguage.getLength() == 3 && isUpperAscii( rLanguage[2])), "i18npool.langtag", + (rLanguage.getLength() == 3 && isUpperAscii( rLanguage[2])), "i18nlangtag", "LanguageTag::isIsoLanguage: rejecting upper case " << rLanguage); return false; } @@ -873,7 +873,7 @@ bool LanguageTag::isIsoCountry( const OUString& rRegion ) (rRegion.getLength() == 2 && isUpperAscii( rRegion[0]) && isUpperAscii( rRegion[1]))) return true; SAL_WARN_IF( rRegion.getLength() == 2 && (isLowerAscii( rRegion[0]) || isLowerAscii( rRegion[1])), - "i18npool.langtag", "LanguageTag::isIsoCountry: rejecting lower case " << rRegion); + "i18nlangtag", "LanguageTag::isIsoCountry: rejecting lower case " << rRegion); return false; } @@ -890,7 +890,7 @@ bool LanguageTag::isIsoScript( const OUString& rScript ) SAL_WARN_IF( rScript.getLength() == 4 && (isLowerAscii( rScript[0]) || isUpperAscii( rScript[1]) || isUpperAscii( rScript[2]) || isUpperAscii( rScript[3])), - "i18npool.langtag", "LanguageTag::isIsoScript: rejecting case mismatch " << rScript); + "i18nlangtag", "LanguageTag::isIsoScript: rejecting case mismatch " << rScript); return false; } @@ -964,8 +964,8 @@ OUString LanguageTag::getGlibcLocaleString( const OUString & rEncoding ) const else { /* FIXME: use the aImplIsoLangGLIBCModifiersEntries table from - * i18npool/source/isolang/isolang.cxx or let liblangtag handle it. So - * far no code was prepared for anything else than a simple + * i18nlangtag/source/isolang/isolang.cxx or let liblangtag handle it. + * So far no code was prepared for anything else than a simple * language_country locale so we don't loose anything here right now. * */ } @@ -1039,7 +1039,7 @@ bool LanguageTag::isValidBcp47() const { if (meIsLiblangtagNeeded != DECISION_NO && !mpImplLangtag) const_cast<LanguageTag*>(this)->canonicalize(); - SAL_WARN_IF( meIsValid == DECISION_DONTKNOW, "i18npool.langtag", + SAL_WARN_IF( meIsValid == DECISION_DONTKNOW, "i18nlangtag", "LanguageTag::isValidBcp47: canonicalize() didn't set meIsValid"); } return meIsValid == DECISION_YES; diff --git a/i18npool/source/languagetag/simple-langtag.cxx b/i18nlangtag/source/languagetag/simple-langtag.cxx index d96f721dbeef..d96f721dbeef 100644 --- a/i18npool/source/languagetag/simple-langtag.cxx +++ b/i18nlangtag/source/languagetag/simple-langtag.cxx diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk deleted file mode 100644 index 02aae4126859..000000000000 --- a/i18npool/CppunitTest_i18npool_test_languagetag.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_languagetag)) - -$(eval $(call gb_CppunitTest_use_api,i18npool_test_languagetag,\ - udkapi \ - offapi \ -)) - -$(eval $(call gb_CppunitTest_use_library_objects,i18npool_test_languagetag,i18nisolang1)) - -$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\ - cppu \ - cppuhelper \ - sal \ - $(gb_UWINAPI) \ -)) - -ifeq ($(ENABLE_LIBLANGTAG),YES) -$(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\ - liblangtag \ - libxml2 \ -)) -$(eval $(call gb_CppunitTest_add_defs,i18npool_test_languagetag,-DENABLE_LIBLANGTAG)) - -ifeq ($(SYSTEM_LIBLANGTAG),YES) -$(eval $(call gb_CppunitTest_add_defs,i18npool_test_languagetag,-DSYSTEM_LIBLANGTAG)) -else -$(eval $(call gb_CppunitTest_use_package,i18npool_test_languagetag,langtag_data)) -endif -endif - -$(eval $(call gb_CppunitTest_set_include,i18npool_test_languagetag,\ - -I$(SRCDIR)/i18npool/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_languagetag,\ - i18npool/qa/cppunit/test_languagetag \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index cd7b0ec7de15..9056fb916871 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ comphelper \ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ sal \ $(gb_UWINAPI) \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index 9a91a504c730..bad0d7afa0b7 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,i18nsearch)) -$(eval $(call gb_Library_use_package,i18nsearch,i18npool_inc)) +$(eval $(call gb_Library_use_package,i18nsearch,i18nlangtag_inc)) $(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch)) diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk index 9eb5c31f4c4b..793add8aa61a 100644 --- a/i18npool/Module_i18npool.mk +++ b/i18npool/Module_i18npool.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_targets,i18npool,\ Library_collator_data \ Library_dict_ja \ Library_dict_zh \ - Library_i18nisolang1 \ Library_i18npool \ Library_i18nsearch \ Library_index_data \ @@ -46,7 +45,6 @@ $(eval $(call gb_Module_add_targets,i18npool,\ Library_localedata_euro \ Library_localedata_others \ Library_textconv_dict \ - Package_inc \ )) $(eval $(call gb_Module_add_targets_for_build,i18npool,\ @@ -60,7 +58,6 @@ $(eval $(call gb_Module_add_targets_for_build,i18npool,\ $(eval $(call gb_Module_add_check_targets,i18npool,\ CppunitTest_i18npool_test_breakiterator \ CppunitTest_i18npool_test_characterclassification \ - CppunitTest_i18npool_test_languagetag \ CppunitTest_i18npool_test_ordinalsuffix \ CppunitTest_i18npool_test_textsearch \ )) diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index ae2033570b33..66b51747bd1f 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -19,7 +19,7 @@ #include <localedata.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <rtl/ustrbuf.hxx> #include <string.h> #include <stdio.h> diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index c02562be385c..8de5a8cefc78 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <rtl/ustrbuf.hxx> #include <sal/macros.h> #include <nativenumbersupplier.hxx> diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index 8b2546f06772..916c56ebb439 100644 --- a/ios/qa/sc/Makefile +++ b/ios/qa/sc/Makefile @@ -39,7 +39,7 @@ SRCS = filters-test.m CFLAGS = $(SOLARINC) -LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc +LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc all: $(APPDIR)/$(APP) stuff 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> 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> diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 7966c106e936..39f06396e0e6 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ cppu \ cppuhelper \ sal \ - i18nisolang1 \ + i18nlangtag \ sfx \ sot \ svt \ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 2bcbdf59d00c..5cc52aeef036 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,oox,\ editeng \ msfilter \ sal \ - i18nisolang1 \ + i18nlangtag \ sax \ sfx \ svl \ diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 2eb912b90d86..da49de249591 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_libraries,spa,\ tl \ basegfx \ comphelper \ - i18nisolang1 \ + i18nlangtag \ cppu \ sal \ $(gb_UWINAPI) \ diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index 8e16ca406710..988cc82fd3ca 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -32,7 +32,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <unotools/confignode.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <rtl/ustrbuf.hxx> diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 3520536b1d88..6e840a3d426d 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_libraries,rpt,\ dbu \ editeng \ fwe \ - i18nisolang1 \ + i18nlangtag \ sal \ salhelper \ sfx \ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 3c84db3d23c6..4c5e25501899 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Library_use_libraries,rptui,\ for \ forui \ fwe \ - i18nisolang1 \ + i18nlangtag \ rpt \ sal \ salhelper \ diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 4f87302f31de..b8c9b13bc901 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -32,8 +32,8 @@ #include <editeng/unolingu.hxx> #include <unotools/syslocale.hxx> #include <unotools/lingucfg.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> // ============================================================================= namespace reportdesign diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 704beb06179b..ff16950ad394 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -94,7 +94,7 @@ #include <com/sun/star/report/Function.hpp> #include <com/sun/star/sdb/XParametersSupplier.hpp> #include <com/sun/star/sdb/SQLContext.hpp> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include "dlgpage.hxx" #include <vcl/msgbox.hxx> #include "rptui_slotid.hrc" diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index e7a182293549..4958491bf4d4 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_defs,rsc,\ )) $(eval $(call gb_Executable_use_libraries,rsc,\ - i18nisolang1 \ + i18nlangtag \ comphelper \ sal \ tl \ diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 38c5a1913109..ef74ef7c360d 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -23,7 +23,7 @@ #include <string.h> #include <tools/rc.h> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <rtl/strbuf.hxx> #include <sal/log.hxx> #include <sal/macros.h> diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index ca86a9fb4ba5..7ff0487fa105 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -22,8 +22,8 @@ #include <stdio.h> #include <string.h> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <comphelper/string.hxx> #include <tools/rc.h> #include <tools/color.hxx> diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox index b14cb46cddba..6466c6e058bb 100644 --- a/sal/inc/sal/log-areas.dox +++ b/sal/inc/sal/log-areas.dox @@ -128,10 +128,13 @@ certain functionality. @li @c fwk.desktop @li @c fwk.session +@section i18nlangtag + +@li @c i18nlangtag - language tags + @section i18npool @li @c i18npool - general i18npool -@li @c i18npool.langtag - language tags @section i18n 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> diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index e502efd65f27..2712383a4160 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,analysis,\ cppuhelper \ sal \ tl \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index d9fb4d3c9e91..2154354d51f2 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,date,\ cppuhelper \ sal \ tl \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/scaddins/Library_pricing.mk b/scaddins/Library_pricing.mk index 12d8032921ec..d2367af51920 100644 --- a/scaddins/Library_pricing.mk +++ b/scaddins/Library_pricing.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,pricing,\ cppuhelper \ sal \ tl \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 5561cc76f48b..7f938d3e9340 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,solver,\ cppuhelper \ sal \ tl \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 2c7276594f20..ef6db5dd5ee6 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -621,9 +621,9 @@ End File gid_File_Lib_I18nisolang #ifdef UNX - Name = STRING(CONCAT3(libi18nisolang1,COMID,UNXSUFFIX)); + Name = STRING(CONCAT3(libi18nlangtag,COMID,UNXSUFFIX)); #else - Name = STRING(CONCAT3(i18nisolang1,COMID,.dll)); + Name = STRING(CONCAT3(i18nlangtag,COMID,.dll)); #endif PACKED_LIB_FILE_BODY; End diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index a5511fbd50f6..508ea6dc39d7 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\ cppu \ cppuhelper \ sal \ - i18nisolang1 \ + i18nlangtag \ sb \ sfx \ tl \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 34adf2442604..7fa4da1c9a41 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -50,7 +50,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ drawinglayer \ editeng \ fileacc \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ msfilter \ oox \ diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index cdf1fa431f41..37c6e64cd259 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -46,7 +46,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \ fileacc \ for \ forui \ - i18nisolang1 \ + i18nlangtag \ msfilter \ oox \ sal \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 61af4112fdc1..01883f38821a 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -49,7 +49,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ cppuhelper \ drawinglayer \ editeng \ - i18nisolang1 \ + i18nlangtag \ msfilter \ sal \ sax \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 6a967c563ab4..d1d15b86a545 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -86,7 +86,7 @@ $(eval $(call gb_Library_use_libraries,sd,\ cppuhelper \ drawinglayer \ editeng \ - i18nisolang1 \ + i18nlangtag \ msfilter \ oox \ sal \ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index f667dd24385e..a4db596bc449 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\ cppu \ cppuhelper \ editeng \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ msfilter \ oox \ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index a94b757cd924..14f4fbb7625c 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -57,7 +57,7 @@ $(eval $(call gb_Library_use_libraries,sdui,\ cppu \ cppuhelper \ editeng \ - i18nisolang1 \ + i18nlangtag \ fwk \ fwl \ fwe \ diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 7bd7f39a1f3e..113c2bdf1d25 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -439,8 +439,8 @@ #include <filter/msfilter/msdffimp.hxx> #include <filter/msfilter/msoleexp.hxx> #include <filter/msfilter/svxmsbas.hxx> -#include <i18npool/languagetag.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> #include <iterator> #include <limits.h> #include <linguistic/lngprops.hxx> diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 6687bc7dc436..3fa27ff94efa 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -55,8 +55,8 @@ #include <editeng/outlobj.hxx> #include <unotools/saveopt.hxx> #include <comphelper/extract.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/charclass.hxx> #include <comphelper/processfactory.hxx> #include <unotools/pathoptions.hxx> diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 0a7dc0287b7e..0c850dbf7cd4 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> #include "Outliner.hxx" diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 4965de7ba382..37a687772149 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -76,7 +76,7 @@ #include <com/sun/star/table/BorderLine.hpp> #include <set> #include <oox/ole/olehelper.hxx> -#include "i18npool/languagetag.hxx" +#include "i18nlangtag/languagetag.hxx" using namespace ::com::sun::star; diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 0f3a2b5a0c82..fd18aacb957b 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -46,7 +46,7 @@ /////////////////////////////////////////////////////////////////////// #include <vcl/ctrl.hxx> #include <tools/color.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <svtools/colorcfg.hxx> #include <svx/xlndsit.hxx> #include <svx/xlineit0.hxx> diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 9c1c5ed5a134..88829865027a 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -20,7 +20,7 @@ #include "PresenterTextView.hxx" -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <cppcanvas/vclfactory.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index c441a4d520f2..983ce76766ec 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.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 <comphelper/propertysetinfo.hxx> #include <editeng/eeitem.hxx> #include <svx/unopool.hxx> diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index d29fc55bb8e2..bd12b3c987be 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -22,7 +22,7 @@ #include <svx/svxids.hrc> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/adjustitem.hxx> diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index e208e86415d8..85353dcbdf2b 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -32,7 +32,7 @@ $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ comphelper_inc \ cppu_odk_headers \ cppuhelper_odk_headers \ - i18npool_inc \ + i18nlangtag_inc \ o3tl_inc \ rsc_inc \ sal_generated \ diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index ce8df30f3ee6..bce79e495938 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ cppu \ cppuhelper \ fwe \ - i18nisolang1 \ + i18nlangtag \ sal \ sax \ sb \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index bbc5ba0fc95c..98adaa92dfbe 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_libraries,sfx,\ cppuhelper \ drawinglayer \ fwe \ - i18nisolang1 \ + i18nlangtag \ sal \ sax \ sb \ diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx index 7aee88fc8bf1..7569afe483c2 100644 --- a/sfx2/inc/sfx2/sfxhtml.hxx +++ b/sfx2/inc/sfx2/sfxhtml.hxx @@ -23,7 +23,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <svtools/parhtml.hxx> #include <svl/macitem.hxx> diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index b1ccfaf601df..182bed8cdf1b 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -34,7 +34,7 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <unotools/localfilehelper.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <sfx2/request.hxx> #include "fileobj.hxx" diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index e5ecb8b998bb..dc462d05558d 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_sdk_api,lngconvex)) $(eval $(call gb_Executable_use_libraries,lngconvex,\ comphelper \ - i18nisolang1 \ + i18nlangtag \ sal \ tl \ $(gb_UWINAPI) \ diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index 707dbe5a403c..1d702eb11798 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -51,7 +51,7 @@ typedef unsigned short WORD; #include "sal/main.h" #include "tools/config.hxx" -#include "i18npool/languagetag.hxx" +#include "i18nlangtag/languagetag.hxx" #include <iostream> #include <fstream> diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index cbccd67e4abd..637724d54857 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -68,7 +68,7 @@ gb_MERGEDLIBS := \ $(call gb_Helper_optional,DESKTOP,helplinker) \ hwp \ hyphen \ - i18npool \ + i18nlangtag \ i18nutil \ $(if $(filter TRUE,$(SOLAR_JAVA)),javaloader) \ $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \ diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index b6eb6b7dd093..f50af4a1db01 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,sot,\ cppu \ cppuhelper \ sal \ - i18nisolang1 \ + i18nlangtag \ tl \ ucbhelper \ utl \ diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 5b2c5a2c0506..f6957ea9fe09 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ cppu \ cppuhelper \ editeng \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ msfilter \ oox \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index c0db2242e116..ab186b0a65a6 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,sm,\ cppuhelper \ editeng \ i18nutil \ - i18nisolang1 \ + i18nlangtag \ msfilter \ oox \ sal \ diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx index f9b64e5521f4..f6cd82351b26 100644 --- a/starmath/inc/pch/precompiled_sm.hxx +++ b/starmath/inc/pch/precompiled_sm.hxx @@ -87,7 +87,7 @@ #include <filter/msfilter/rtfutil.hxx> #include <float.h> #include <fstream> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <iterator> #include <map> #include <math.h> diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 3f358f5dc78e..78734943b5b5 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -20,7 +20,7 @@ #include <stdio.h> #include <com/sun/star/i18n/UnicodeType.hpp> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <unotools/charclass.hxx> #include <editeng/unolingu.hxx> #include <unotools/syslocale.hxx> 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> diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index 96cd1b450e82..c9e33f94dbcc 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -28,7 +28,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,svt,\ $(eval $(call gb_SrsTarget_SrsTarget,svt/res)) $(eval $(call gb_SrsTarget_use_packages,svt/res,\ - i18npool_inc \ + i18nlangtag_inc \ svl_inc \ svtools_inc \ vcl_inc \ diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk index 512c8a18d30b..12c60f231f63 100644 --- a/svtools/Executable_langsupport.mk +++ b/svtools/Executable_langsupport.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\ comphelper \ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ sal \ svt \ tl \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 4f6adaeb2f7f..52f07a4f116f 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,svt,\ comphelper \ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ $(if $(filter TRUE,$(SOLAR_JAVA)), \ jvmfwk) \ diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 6f4dcdc1381e..615967968cb9 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -298,9 +298,9 @@ #include <cstdio> #include <ctype.h> #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 <i18nutil/unicode.hxx> #include <jvmfwk/framework.h> #include <limits.h> diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx index aab0b3b17752..aeed99454006 100644 --- a/svtools/inc/svtools/langtab.hxx +++ b/svtools/inc/svtools/langtab.hxx @@ -21,7 +21,7 @@ #include <tools/resary.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <svtools/svtdllapi.h> //======================================================================== diff --git a/svtools/inc/svtools/sampletext.hxx b/svtools/inc/svtools/sampletext.hxx index f7903d85ed67..5911eb7530f3 100644 --- a/svtools/inc/svtools/sampletext.hxx +++ b/svtools/inc/svtools/sampletext.hxx @@ -31,7 +31,7 @@ #include "svtools/svtdllapi.h" #include <rtl/ustring.hxx> #include <unicode/uscript.h> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <com/sun/star/i18n/ScriptType.hpp> #include <vcl/fontcapabilities.hxx> diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx index efcc5f550ee2..41ef0242c337 100644 --- a/svtools/langsupport/langsupport.cxx +++ b/svtools/langsupport/langsupport.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/bootstrap.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <sal/main.h> #include <svtools/langtab.hxx> #include <tools/extendapplicationenvironment.hxx> diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 4c501704f2b5..fe1201c6495a 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -24,7 +24,7 @@ #include <comphelper/string.hxx> #include <tools/debug.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 697075e93a2b..f3931bbad7ea 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -26,7 +26,7 @@ #include <vcl/svapp.hxx> #include <svl/zformat.hxx> #include <svtools/fmtfield.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/SearchOptions.hpp> #include <com/sun/star/util/SearchAlgorithms.hpp> diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 910cbe926c60..584a205ed9a7 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -23,9 +23,9 @@ #include <com/sun/star/i18n/DirectionProperty.hpp> -#include <i18npool/lang.h> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/lang.h> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <svtools/svtools.hrc> #include <svtools/svtresid.hxx> diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index cafddd7d870f..48f670cf0ae2 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -20,7 +20,7 @@ #include <svtools/svtools.hrc> #define RSC_RESOURCE_USAGE 1 -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #define PairedList ItemList diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 169c01c3ca88..9ebfd965da0f 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,svx,\ cppu \ drawinglayer \ editeng \ - i18nisolang1 \ + i18nlangtag \ sal \ sfx \ sot \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index fb560b722179..c868a5874c01 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ drawinglayer \ editeng \ fwe \ - i18nisolang1 \ + i18nlangtag \ lng \ sal \ salhelper \ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 50db32b3af33..ead619daf964 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ cppuhelper \ cppu \ sal \ - i18nisolang1 \ + i18nlangtag \ svl \ svt \ tk \ diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 5033dc069eae..31ee52c31963 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -259,7 +259,7 @@ #include <editeng/unotext.hxx> #include <editeng/wghtitem.hxx> #include <editeng/wrlmitem.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <limits.h> #include <limits> #include <list> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 84c5f29f16b7..fb69e88f5a62 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -429,8 +429,8 @@ #include <editeng/wrlmitem.hxx> #include <float.h> #include <framework/interaction.hxx> -#include <i18npool/lang.h> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/lang.h> +#include <i18nlangtag/mslangid.hxx> #include <limits> #include <linguistic/misc.hxx> #include <map> diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index efc47fb8de6e..6f767c70c372 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -20,7 +20,7 @@ #define _SVX_NUMFMTSH_HXX #include <tools/string.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include "svx/svxdllapi.h" diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 5dca172caa90..7291b1728cbd 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -25,8 +25,8 @@ #include <tools/urlobj.hxx> #include <svtools/langtab.hxx> #include <tools/shl.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/lang.h> #include <editeng/scripttypeitem.hxx> #include <editeng/unolingu.hxx> #include <svx/langbox.hxx> diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index cc160a744067..cfddf3fab190 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -20,7 +20,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <tools/shl.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <svtools/valueset.hxx> #include <svl/languageoptions.hxx> #include <helpid.hrc> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 053eac32d569..1022fbfebc3c 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -51,7 +51,7 @@ #include <comphelper/string.hxx> #include <connectivity/formattedcolumnvalue.hxx> #include <cppuhelper/typeprovider.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <rtl/math.hxx> #include <svtools/calendar.hxx> diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 179023218786..a630f5b580b7 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -31,8 +31,8 @@ #include <com/sun/star/container/XChild.hpp> #include <comphelper/processfactory.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/syslocale.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 1187f9785d56..d33ca4ca0564 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -21,7 +21,7 @@ #define _SVX_NUMFMTSH_CXX #include <tools/debug.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 6dccf8a26312..54f89dc246b5 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -49,7 +49,7 @@ #include <svl/itempool.hxx> #include <unotools/localedatawrapper.hxx> #include <com/sun/star/lang/Locale.hpp> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <unotools/syslocale.hxx> #include <svx/xflbckit.hxx> #include <svx/extrusionbar.hxx> diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 8e482d2e5081..35a645778c73 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -49,7 +49,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \ unotest \ utl \ vcl \ - i18nisolang1 \ + i18nlangtag \ comphelper \ cppu \ cppuhelper \ diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index af54e0af27da..d518371efdd4 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -44,7 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ fileacc \ for \ forui \ - i18nisolang1 \ + i18nlangtag \ msfilter \ oox \ sal \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index c42174c655d4..3a6e67a9486d 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -46,7 +46,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ fileacc \ for \ forui \ - i18nisolang1 \ + i18nlangtag \ msfilter \ oox \ sal \ diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk index 783aa30e082c..77485539a83e 100644 --- a/sw/CppunitTest_sw_rtfimport.mk +++ b/sw/CppunitTest_sw_rtfimport.mk @@ -39,7 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_rtfimport, \ cppu \ cppuhelper \ sal \ - i18nisolang1 \ + i18nlangtag \ sw \ test \ unotest \ diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk index 5bfd41018bf0..6054a1b7b628 100644 --- a/sw/CppunitTest_sw_uwriter.mk +++ b/sw/CppunitTest_sw_uwriter.mk @@ -44,7 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \ cppuhelper \ drawinglayer \ editeng \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ lng \ oox \ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 761800b88bed..ef640cde4694 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,msword,\ cppu \ cppuhelper \ editeng \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ msfilter \ sal \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 8438bb404a67..de51354ebeff 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Library_use_libraries,sw,\ cppuhelper \ drawinglayer \ editeng \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ lng \ sal \ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 771ddfac1f6e..f2c62e905bae 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,swui,\ cppu \ cppuhelper \ editeng \ - i18nisolang1 \ + i18nlangtag \ msfilter \ sal \ sfx \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index 61d273b71305..61a8f767961d 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ cppu \ cppuhelper \ editeng \ - i18nisolang1 \ + i18nlangtag \ sal \ sb \ sfx \ diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index dc990c5955cf..669660ac1296 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -21,7 +21,7 @@ #define _ENHANCEDPDFEXPORTHELPER_HXX #include <vcl/pdfextoutdevdata.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <swrect.hxx> #include <swtypes.hxx> diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 0bfc579bdef1..8319dea8c544 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/XScriptTypeDetector.hpp> #include <com/sun/star/i18n/ForbiddenCharacters.hpp> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <swdllapi.h> /************************************************************************* diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx index 85ebfc2e20c4..f4d999068d39 100644 --- a/sw/inc/extinput.hxx +++ b/sw/inc/extinput.hxx @@ -20,7 +20,7 @@ #define _EXTINPUT_HXX #include <pam.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <vector> class CommandExtTextInputData; diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 55834ff45cb4..814ba38962a1 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -19,7 +19,7 @@ #ifndef SW_FLDBAS_HXX #define SW_FLDBAS_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/string.hxx> #include "swdllapi.h" #include <calbck.hxx> diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index c202b0c99d99..456f452d28a7 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -152,9 +152,9 @@ #include <filter/msfilter/svxmsbas.hxx> #include <fstream> #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 <iterator> #include <list> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 57eb61b0ed0b..104df5b09c43 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -19,7 +19,7 @@ #include "cppuhelper/implementationentry.hxx" #include "editeng/frmdiritem.hxx" #include "editeng/unolingu.hxx" -#include "i18npool/languagetag.hxx" +#include "i18nlangtag/languagetag.hxx" #include "rtl/ref.hxx" #include "sal/config.h" #include "sal/types.h" @@ -588,9 +588,9 @@ #include <editeng/xmlcnitm.hxx> #include <float.h> #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 <i18nutil/scripttypedetector.hxx> #include <i18nutil/unicode.hxx> #include <iostream> diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index 8d8be4635ba0..255a5fec84ff 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -19,7 +19,7 @@ #ifndef _SPLARGS_HXX #define _SPLARGS_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/solar.h> #include <tools/gen.hxx> #include <limits.h> // USHRT_MAX diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx index 0d150bccdb5b..622d742ee475 100644 --- a/sw/inc/swcalwrp.hxx +++ b/sw/inc/swcalwrp.hxx @@ -20,7 +20,7 @@ #ifndef _SWCALWRP_HXX #define _SWCALWRP_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/string.hxx> #include <unotools/calendarwrapper.hxx> #include <salhelper/singletonref.hxx> diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx index b1f21baa9994..e326f91a7535 100644 --- a/sw/inc/swscanner.hxx +++ b/sw/inc/swscanner.hxx @@ -20,7 +20,7 @@ #ifndef _SWSCANNER_HXX #define _SWSCANNER_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <modeltoviewhelper.hxx> class SwTxtNode; diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index c24008a0010d..4b41e45bfc44 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -25,7 +25,7 @@ #include <limits.h> //For LONG_MAX. #include <com/sun/star/uno/Reference.h> #include "swdllapi.h" -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> namespace com { namespace sun { namespace star { namespace linguistic2{ diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 8b3dda579281..4eb7b1d1dfcb 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -21,7 +21,7 @@ #include <cppuhelper/weakref.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <svl/poolitem.hxx> #include <tools/string.hxx> #include <osl/diagnose.h> diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 3a9a7919d584..a3ea2bd56b77 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/SearchOptions.hpp> #include <com/sun/star/util/SearchFlags.hpp> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <hintids.hxx> #include <vcl/svapp.hxx> #include <svl/itemiter.hxx> diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 63fb41444e74..7c36432c29ea 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -19,7 +19,7 @@ #include <hintids.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <unotools/localedatawrapper.hxx> #include <editeng/paperinf.hxx> #include <editeng/wghtitem.hxx> diff --git a/sw/source/core/doc/sortopt.cxx b/sw/source/core/doc/sortopt.cxx index 5ca622ad3502..1f7c4b211b39 100644 --- a/sw/source/core/doc/sortopt.cxx +++ b/sw/source/core/doc/sortopt.cxx @@ -18,7 +18,7 @@ */ -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <sortopt.hxx> #include <boost/foreach.hpp> diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 52f7018bba2d..7e2e01713ec1 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -19,7 +19,7 @@ #ifndef _SWFONT_HXX #define _SWFONT_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/color.hxx> #include <tools/stream.hxx> #include <tools/gen.hxx> diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 990ada1ab9a8..05cdaf1b9d74 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -19,7 +19,7 @@ #ifndef SW_TXMSRT_HXX #define SW_TXMSRT_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tox.hxx> #include <com/sun/star/lang/Locale.hpp> diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index eb87695da079..515037c3d956 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -68,7 +68,7 @@ #include <porfld.hxx> #include <SwStyleNameMapper.hxx> #include <itrpaint.hxx> -#include "i18npool/languagetag.hxx" +#include "i18nlangtag/languagetag.hxx" #include <IMark.hxx> #include <SwNodeNum.hxx> #include <switerator.hxx> diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 4115e73eb798..6fa5b436fe1b 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -40,7 +40,7 @@ #include <editeng/blinkitem.hxx> #include <tools/multisel.hxx> #include <unotools/charclass.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <charfmt.hxx> #include <fchrfmt.hxx> #include <docary.hxx> // SwRedlineTbl diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index d6a01f20eb73..26972e6e512f 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -20,7 +20,7 @@ #include <ctype.h> #include <com/sun/star/i18n/ScriptType.hpp> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <hintids.hxx> // CH_TXTATR #include <EnhancedPDFExportHelper.hxx> #include <SwPortionHandler.hxx> diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index b41fa2cc03f5..de510714e6bf 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <vcl/outdev.hxx> #include <vcl/print.hxx> #include <vcl/lineinfo.hxx> diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 243774fd8695..8cc721ecfed1 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -20,8 +20,8 @@ #include <string.h> #include <stdio.h> // sscanf #include <hintids.hxx> -#include <i18npool/lang.h> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/lang.h> +#include <i18nlangtag/languagetag.hxx> #include <vcl/msgbox.hxx> #include <svtools/parhtml.hxx> #include <sot/storage.hxx> diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 16250505f516..c85cd2165cc4 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -55,7 +55,7 @@ #include <tools/urlobj.hxx> #include <tools/bigint.hxx> #include <unotools/charclass.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <charfmt.hxx> #include <fmtclds.hxx> #include <fmtcol.hxx> diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 4141a146be31..a580a1e65433 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -21,7 +21,7 @@ #include <svl/itemiter.hxx> #include <svl/whiter.hxx> #include <svl/urihelper.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <sfx2/docfile.hxx> #include <vcl/svapp.hxx> #include <editeng/fhgtitem.hxx> diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 636f626e3e84..4c3e9afffa76 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -24,7 +24,7 @@ #include <vcl/wrkwin.hxx> #include <svx/svxids.hrc> #include <sfx2/sfx.hrc> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <svl/stritem.hxx> #include <svl/urihelper.hxx> #include <editeng/fhgtitem.hxx> diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index c204fb53673e..7a5c944fd5ba 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -20,7 +20,7 @@ #include <stdlib.h> #include <svx/svxids.hrc> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <svtools/ctrltool.hxx> #include <svl/urihelper.hxx> #include <editeng/udlnitem.hxx> diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 78f7e7a1bda4..c0eb4076026b 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -27,7 +27,7 @@ #include <svtools/htmlcfg.hxx> #include <vcl/svapp.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <sfx2/frmhtmlw.hxx> #include <svx/xoutbmp.hxx> #include <svx/htmlmode.hxx> diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 6d10be73b388..5b68aaeca0aa 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/form/XForm.hpp> #include <vcl/field.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/stream.hxx> #include <o3tl/sorted_vector.hxx> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index d5341cad5d4c..1216829af07e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -33,7 +33,7 @@ #include <oox/export/utils.hxx> #include <oox/mathml/export.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <editeng/fontitem.hxx> #include <editeng/tstpitem.hxx> diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index f5e1f530c31f..93d892ccf34e 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -44,7 +44,7 @@ #include <frmatr.hxx> //GetLRSpace... #include <ndtxt.hxx> //SwTxtNode #include <breakit.hxx> //pBreakIt -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #define ASSIGN_CONST_ASC(s) AssignAscii(s) diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index fe01be8b9267..3210c5f1fc65 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -125,7 +125,7 @@ #include "ww8attributeoutput.hxx" #include "fields.hxx" #include <vcl/outdev.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> using ::editeng::SvxBorderLine; using namespace ::com::sun::star; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 4c2ab5ef65a4..abdd6529ce56 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/embed/ElementModes.hpp> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/ucbstreamhelper.hxx> #include <rtl/random.h> diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index c37da4aaae82..8eb7940f9af1 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -66,7 +66,7 @@ #include <editeng/pgrditem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/charhiddenitem.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <fmtpdsc.hxx> #include <node.hxx> #include <ndtxt.hxx> // SwTxtNode, siehe unten: JoinNode() diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 80d6687734d3..a8ecc85e4f11 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -23,7 +23,7 @@ #include <algorithm> #include <string.h> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <rtl/tencinfo.h> #include <sal/macros.h> @@ -40,7 +40,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <unotools/localedatawrapper.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <editeng/unolingu.hxx> #include <vcl/svapp.hxx> // Application #i90932# diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index dc1f4228212e..1b792f8dab3e 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -36,8 +36,8 @@ #include <svx/optgrid.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <fontcfg.hxx> #include <optload.hxx> #include <optcomp.hxx> diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 108a4b98b60b..716e70fab400 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -21,7 +21,7 @@ #include <hintids.hxx> #include <svx/dialogs.hrc> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <sot/storinfo.hxx> #include <sot/storage.hxx> #include <svl/zforlist.hxx> diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx index d95135542b70..22be0e3a00fc 100644 --- a/sw/source/ui/config/fontcfg.cxx +++ b/sw/source/ui/config/fontcfg.cxx @@ -19,7 +19,7 @@ #include <fontcfg.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <vcl/outdev.hxx> #include <unotools/lingucfg.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 7279ef1163a7..cc63401d0a20 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -102,7 +102,7 @@ #include <mailmergehelper.hxx> #include <maildispatcher.hxx> #include <svtools/htmlcfg.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <editeng/langitem.hxx> #include <svl/numuno.hxx> diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 5f6ab9a6db14..762a22ec6e0b 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -19,7 +19,7 @@ #include <hintids.hxx> #include <rtl/textenc.h> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <unotools/lingucfg.hxx> #include <fontcfg.hxx> diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index a4218d3612ac..d10b3b165b35 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -69,8 +69,8 @@ #include <editeng/langitem.hxx> #include <editeng/outliner.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/lang.h> #include "swevent.hxx" #include "switerator.hxx" diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx index 646360175c0d..f6b6198b7cb3 100644 --- a/sw/source/ui/inc/fontcfg.hxx +++ b/sw/source/ui/inc/fontcfg.hxx @@ -21,7 +21,7 @@ #include <unotools/configitem.hxx> #include <tools/string.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <osl/diagnose.h> #include "swdllapi.h" diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index a2c1f1789f3f..6745622568c1 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -51,8 +51,8 @@ #include <editeng/splwrap.hxx> #include <editeng/brushitem.hxx> #include <editeng/unolingu.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <linguistic/lngprops.hxx> #include <linguistic/misc.hxx> #include <osl/file.hxx> diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 258f746f54f1..c425a66e4d78 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <tools/shl.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 90cd5db13de5..735b7b56e6b7 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -22,7 +22,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index c836383feeee..d0d6f12e5123 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -19,7 +19,7 @@ #include <hintids.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <svl/slstitm.hxx> #include <svl/cjkoptions.hxx> #include <editeng/fontitem.hxx> diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index e92cde6b2355..e5afbb385a13 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -26,7 +26,7 @@ #include <cmdid.h> #include <helpid.h> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <svl/languageoptions.hxx> #include <editeng/langitem.hxx> #include <svtools/langtab.hxx> diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 5c3aaf9e1b91..3e4e50ed8864 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -108,7 +108,7 @@ #include <editeng/langitem.hxx> #include <docary.hxx> //SwCharFmts -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <format.hxx> #include <charfmt.hxx> //SwCharFmt diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx index ced66d4a1731..32bf99a1ce39 100644 --- a/sw/source/ui/utlui/numfmtlb.cxx +++ b/sw/source/ui/utlui/numfmtlb.cxx @@ -22,7 +22,7 @@ #include <comphelper/processfactory.hxx> #include <editeng/unolingu.hxx> #include <unotools/localedatawrapper.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <svl/zformat.hxx> #include <svl/eitem.hxx> #include <svx/svxids.hrc> diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 28f09cc38ea7..5bd5a109311d 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -21,7 +21,7 @@ #include <ooo/vba/word/WdStyleType.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/text/XTextDocument.hpp> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include "vbafont.hxx" #include "vbapalette.hxx" #include "vbaparagraphformat.hxx" diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 7fd5958ddbdc..559d3902cb1a 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ comphelper \ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ sal \ test \ tl \ diff --git a/test/Library_test.mk b/test/Library_test.mk index ca0eff6c4460..3db6aeb085a6 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,test,\ comphelper \ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ sal \ svt \ tl \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 9ddda1a66238..2bdc643793fa 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -51,7 +51,7 @@ $(eval $(call gb_Library_use_libraries,tk,\ cppu \ cppuhelper \ sal \ - i18nisolang1 \ + i18nlangtag \ tl \ utl \ vcl \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index a48117e194f8..34f247128516 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_sdk_api,tl)) $(eval $(call gb_Library_use_libraries,tl,\ basegfx \ comphelper \ - i18nisolang1 \ + i18nlangtag \ cppu \ sal \ $(gb_UWINAPI) \ diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx index 1b9029612bf2..8ee386474214 100644 --- a/tools/inc/tools/rc.hxx +++ b/tools/inc/tools/rc.hxx @@ -20,7 +20,7 @@ #define _TOOLS_RC_HXX #include "tools/toolsdllapi.h" -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/string.hxx> #include <tools/resmgr.hxx> diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx index 10bbfdc8734c..2fc6cf597375 100644 --- a/tools/inc/tools/resmgr.hxx +++ b/tools/inc/tools/resmgr.hxx @@ -20,7 +20,7 @@ #define _TOOLS_RESMGR_HXX #include "tools/toolsdllapi.h" -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/string.hxx> #include <tools/resid.hxx> diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx index 6176ad5783f3..78021bf92dcc 100644 --- a/tools/inc/tools/simplerm.hxx +++ b/tools/inc/tools/simplerm.hxx @@ -25,7 +25,7 @@ #include <osl/mutex.hxx> #include <tools/resid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/string.hxx> #include "tools/toolsdllapi.h" diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 42b9580ef72f..7ad7092d800e 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -41,8 +41,8 @@ #include <sal/log.hxx> #include <rtl/instance.hxx> #include <rtl/bootstrap.hxx> -#include <i18npool/languagetag.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> #include <tools/simplerm.hxx> #include <functional> diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index dcef7a82155a..66717c90b993 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_libraries,utl,\ comphelper \ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ sal \ salhelper \ tl \ diff --git a/unotools/inc/unotools/charclass.hxx b/unotools/inc/unotools/charclass.hxx index c08e84c7d0a4..6ea11f62063d 100644 --- a/unotools/inc/unotools/charclass.hxx +++ b/unotools/inc/unotools/charclass.hxx @@ -23,7 +23,7 @@ #include <ctype.h> // isdigit(), isalpha() #include <boost/noncopyable.hpp> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/string.hxx> #include <tools/solar.h> #include <com/sun/star/i18n/KCharacterType.hpp> diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx index 0320d2a8204e..9165be22b414 100644 --- a/unotools/inc/unotools/intlwrapper.hxx +++ b/unotools/inc/unotools/intlwrapper.hxx @@ -24,8 +24,8 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/collatorwrapper.hxx> -#include <i18npool/lang.h> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/lang.h> +#include <i18nlangtag/languagetag.hxx> /** diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx index 88aaa4a5ba56..085bcc0fe260 100644 --- a/unotools/inc/unotools/lingucfg.hxx +++ b/unotools/inc/unotools/lingucfg.hxx @@ -31,7 +31,7 @@ #include <unotools/configitem.hxx> #include <osl/mutex.hxx> #include <unotools/options.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <vector> diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx index 1db497abcd3f..78321b6bbb2f 100644 --- a/unotools/inc/unotools/localedatawrapper.hxx +++ b/unotools/inc/unotools/localedatawrapper.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/i18n/LocaleItem.hpp> #include <com/sun/star/i18n/reservedWords.hpp> #include <rtl/ustring.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/readwritemutexguard.hxx> #include "unotools/unotoolsdllapi.h" diff --git a/unotools/inc/unotools/syslocale.hxx b/unotools/inc/unotools/syslocale.hxx index e148504d0940..d32a22139129 100644 --- a/unotools/inc/unotools/syslocale.hxx +++ b/unotools/inc/unotools/syslocale.hxx @@ -23,7 +23,7 @@ #include "unotools/unotoolsdllapi.h" #include <unotools/localedatawrapper.hxx> #include <unotools/charclass.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <sal/types.h> #include <rtl/textenc.h> diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx index b9acc8c4b099..2deffdc734ec 100644 --- a/unotools/inc/unotools/syslocaleoptions.hxx +++ b/unotools/inc/unotools/syslocaleoptions.hxx @@ -25,8 +25,8 @@ #include <rtl/ustring.hxx> #include <tools/solar.h> #include <tools/link.hxx> -#include <i18npool/lang.h> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/lang.h> +#include <i18nlangtag/languagetag.hxx> #include <tools/string.hxx> #include <unotools/options.hxx> diff --git a/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx index 5e4244f209a2..63ab0dece4e3 100644 --- a/unotools/inc/unotools/textsearch.hxx +++ b/unotools/inc/unotools/textsearch.hxx @@ -20,7 +20,7 @@ #ifndef _UNOTOOLS_TEXTSEARCH_HXX #define _UNOTOOLS_TEXTSEARCH_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <rtl/ustring.hxx> #include <tools/string.hxx> #include <com/sun/star/uno/Reference.h> diff --git a/unotools/inc/unotools/transliterationwrapper.hxx b/unotools/inc/unotools/transliterationwrapper.hxx index 18b7072fdae9..6d64d40a92f1 100644 --- a/unotools/inc/unotools/transliterationwrapper.hxx +++ b/unotools/inc/unotools/transliterationwrapper.hxx @@ -22,7 +22,7 @@ #define _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX #include <tools/string.hxx> #include <tools/solar.h> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <com/sun/star/i18n/XExtendedTransliteration.hpp> namespace com { namespace sun { namespace star { diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 85cbdb5120d6..223e42ec533a 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <unotools/fontcfg.hxx> #include <unotools/fontdefs.hxx> #include <comphelper/processfactory.hxx> diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index f0e8d131188f..24d8b196a9f8 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -28,8 +28,8 @@ #include <rtl/uri.hxx> #include <rtl/instance.hxx> #include <osl/mutex.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/debug.hxx> #include <tools/string.hxx> #include <unotools/lingucfg.hxx> diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 031c3529dc10..a77612016705 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -21,8 +21,8 @@ #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> #include <rtl/logfile.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/string.hxx> #include <tools/debug.hxx> #include <unotools/syslocaleoptions.hxx> diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index 059f08d9c22a..0382e768ab16 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.cxx @@ -20,7 +20,7 @@ #include "unotools/intlwrapper.hxx" #include <com/sun/star/i18n/CollatorOptions.hpp> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <comphelper/processfactory.hxx> IntlWrapper::IntlWrapper( diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index d820c8e2b37d..293bd27e36cd 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -27,7 +27,7 @@ #include <unotools/digitgroupingiterator.hxx> #include <tools/string.hxx> #include <tools/debug.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <com/sun/star/i18n/KNumberFormatUsage.hpp> #include <com/sun/star/i18n/KNumberFormatType.hpp> diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 2b51179928f1..7e4a2db179ec 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.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 <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/TextSearch.hpp> #include <com/sun/star/util/SearchFlags.hpp> diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index 3a41dcb976f6..23d7acbfa374 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -20,7 +20,7 @@ #include <unotools/transliterationwrapper.hxx> #include <tools/debug.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <com/sun/star/i18n/Transliteration.hpp> diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index 0e489e13865b..4b0cca4ee486 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,uui,\ cppu \ cppuhelper \ sal \ - i18nisolang1 \ + i18nlangtag \ svl \ svt \ tk \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index bce3d93a02b9..ce3ab0472b71 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ $(if $(filter TRUE,$(SOLAR_JAVA)), \ jvmaccess) \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index c5ad854d83c4..0abe61e9c015 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -76,7 +76,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ cppu \ sal \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index edf16e0f92d1..5bef1439ffa3 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 3b8a6d21814b..6607d1057cb1 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 7f29e762b8d4..cd9b63a0994a 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ basebmp \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 249fcb3e01c1..5e9c666a2943 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index ff4b89c275fd..93f68587282a 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index c35bddaf0473..7d40e5eb467f 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ basebmp \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index c4dd88d15bb3..f2c992b5adab 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index f86c81419de3..acac73a6b596 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -34,7 +34,7 @@ $(eval $(call gb_StaticLibrary_use_packages,headless,\ comphelper_inc \ cppu_odk_headers \ cppuhelper_odk_headers \ - i18npool_inc \ + i18nlangtag_inc \ i18nutil_inc \ o3tl_inc \ rsc_inc \ diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index f5dda96627d7..33aff6a36d3c 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -26,7 +26,7 @@ #include <vcl/vclenum.hxx> #include <vcl/wrkwin.hxx> #include "outfont.hxx" -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <i18nutil/unicode.hxx> #include <rtl/strbuf.hxx> #include <unicode/uchar.h> diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index de66c528e493..8a1a5e1ea6b5 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -48,7 +48,7 @@ #include <sal/macros.h> -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" #include "parseAFM.hxx" diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index ab482b4b49dc..ddf6d7cfc22f 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -23,7 +23,7 @@ #include <boost/static_assert.hpp> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index 903b1457f7d3..2e3739c063b3 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -21,7 +21,7 @@ // // Platform -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <sallayout.hxx> // Module #include "gcach_ftyp.hxx" diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index eb6a52929a29..98601f034410 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -53,7 +53,7 @@ #endif #include <comphelper/string.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> using namespace psp; diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index cad00e3d8f3d..0d91254b0612 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -22,7 +22,7 @@ #include <tools/gen.hxx> #include <tools/string.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/color.hxx> #include <vcl/dllapi.h> #include <vcl/vclenum.hxx> diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index e3a516f2062d..9d5066ba5af5 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> #include <tools/string.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/solar.h> #include <vcl/dllapi.h> #include <unotools/fontdefs.hxx> diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index c75e6c82ba4d..e259a58f1908 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -84,8 +84,8 @@ #include "cppuhelper/compbase1.hxx" #include "cppuhelper/compbase2.hxx" #include "cppuhelper/implbase1.hxx" -#include "i18npool/languagetag.hxx" -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/languagetag.hxx" +#include "i18nlangtag/mslangid.hxx" #include "i18nutil/unicode.hxx" #include "osl/diagnose.h" #include "osl/file.h" @@ -285,9 +285,9 @@ #include <ctype.h> #include <fcntl.h> #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 <i18nutil/unicode.hxx> #include <iostream> #include <jerror.h> diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index c9a7e19452e4..62b982f8f5b6 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -20,7 +20,7 @@ #ifndef _SV_SALWTYPE_HXX #define _SV_SALWTYPE_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/string.hxx> #include <tools/solar.h> diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx index 7cc45eff8e38..3a49368fc84f 100644 --- a/vcl/inc/unx/i18n_ic.hxx +++ b/vcl/inc/unx/i18n_ic.hxx @@ -20,7 +20,7 @@ #ifndef _SAL_I18N_INPUTCONTEXT_HXX #define _SAL_I18N_INPUTCONTEXT_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include "i18n_cb.hxx" class SalI18N_InputContext diff --git a/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx index f651ba6c1401..98226249843a 100644 --- a/vcl/inc/vcl/font.hxx +++ b/vcl/inc/vcl/font.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <vcl/dllapi.h> #include <tools/string.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/color.hxx> #include <vcl/vclenum.hxx> #include <vcl/fntstyle.hxx> diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx index 98351ea630cc..ae9a2d092627 100644 --- a/vcl/inc/vcl/i18nhelp.hxx +++ b/vcl/inc/vcl/i18nhelp.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/uno/Reference.h> #include <osl/mutex.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/string.hxx> #include <vcl/dllapi.h> diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index 02e062b31514..4db5e293a5e5 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -148,7 +148,7 @@ public: // case the arbitrary id has to be passed again when the // actual link annotation is created via SetLinkPropertyID LinkAnnotation, - // Language currently sets a LanguageType (see i18npool/lang.h) + // Language currently sets a LanguageType (see i18nlangtag/lang.h) // which will be internally changed to a corresponding locale Language }; diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index b0ef1d5ee0d5..ebb42c365c4d 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -27,7 +27,7 @@ #include "vcl/font.hxx" #include "vcl/accel.hxx" #include "vcl/wall.hxx" -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/syslocale.hxx> class CollatorWrapper; diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index bdec4bb2d3c4..1ed6efceaa48 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -22,7 +22,7 @@ #include "unotools/localedatawrapper.hxx" #include "unotools/transliterationwrapper.hxx" -#include "i18npool/languagetag.hxx" +#include "i18nlangtag/languagetag.hxx" #include "rtl/ustrbuf.hxx" diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index a45f5894c289..adbadbe2ffb4 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -25,8 +25,8 @@ #include "tools/debug.hxx" #include <vcl/graphicfilter.hxx> -#include "i18npool/mslangid.hxx" -#include "i18npool/languagetag.hxx" +#include "i18nlangtag/mslangid.hxx" +#include "i18nlangtag/languagetag.hxx" #include "vcl/svapp.hxx" #include "vcl/event.hxx" diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index d7f3081ab48c..1692170517f0 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -31,7 +31,7 @@ #include "tools/debug.hxx" #include "tools/time.hxx" -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" #include "unotools/syslocaleoptions.hxx" diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 8b9972d09aeb..785358017e41 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -29,7 +29,7 @@ #include <svdata.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/XCharacterClassification.hpp> diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 0413cc0ceb9b..cfe02e9ea513 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "i18npool/mslangid.hxx" -#include "i18npool/languagetag.hxx" +#include "i18nlangtag/mslangid.hxx" +#include "i18nlangtag/languagetag.hxx" #include "rtl/tencinfo.h" #include "rtl/logfile.hxx" diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 1307193868e0..c7cf75b32adf 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -44,7 +44,7 @@ #include <tools/zcodec.hxx> #include <tools/stream.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <vcl/virdev.hxx> #include <vcl/bmpacc.hxx> diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 10cde2e4636d..ebf348cb0e4b 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -30,7 +30,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/debug.hxx> diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 877e1dd9d2d3..83c6f63c6177 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -25,7 +25,7 @@ #include <vcl/unohelp.hxx> #include <com/sun/star/i18n/XCharacterClassification.hpp> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> using namespace ::com::sun::star; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 8c9c30f5cf9a..629a1cf8bc5d 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -19,7 +19,7 @@ #include <config_features.h> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include "tools/time.hxx" #include "tools/debug.hxx" diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 96ce72da2bdf..8cec77e5bda5 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -42,7 +42,7 @@ #include "basegfx/polygon/b2dpolypolygon.hxx" -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" #include <boost/unordered_set.hpp> diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index afbe04e967b4..3d7a40017689 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -25,7 +25,7 @@ #include "rtl/logfile.hxx" #include "rtl/bootstrap.hxx" -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" #include "osl/file.hxx" #include "osl/process.h" diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 83bb2c3f5980..bc3f8021743c 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -52,7 +52,7 @@ typedef boost::unordered_map<int,int> IntMap; // Graphite headers #include <config_graphite.h> #if ENABLE_GRAPHITE -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <graphite_layout.hxx> #include <graphite_features.hxx> #endif diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 917228ddd947..79d878aebed1 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -71,7 +71,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ cppu \ cppuhelper \ editeng \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ msfilter \ oox \ diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index addf20b015a8..b277bdf82f21 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -168,7 +168,7 @@ #include <filter/msfilter/util.hxx> #include <fstream> #include <functional> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <i18nutil/paper.hxx> #include <iostream> #include <iterator> diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index d136e1be5c40..4e07c47243fd 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -23,7 +23,7 @@ #include <ConversionHelper.hxx> #include <ModelEventListener.hxx> #include <MeasureHandler.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <i18nutil/paper.hxx> #include <ooxml/OOXMLFastTokens.hxx> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk index 95c63cbb04fe..cb0aeec73284 100644 --- a/xmlhelp/Library_tvhlp1.mk +++ b/xmlhelp/Library_tvhlp1.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_libraries,tvhlp1,\ cppuhelper \ sal \ utl \ - i18nisolang1 \ + i18nlangtag \ )) $(eval $(call gb_Library_add_exception_objects,tvhlp1,\ diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index a1d119f278e1..ecadcca943f0 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -71,7 +71,7 @@ $(eval $(call gb_Library_use_libraries,ucpchelp1,\ sal \ ucbhelper \ utl \ - i18nisolang1 \ + i18nlangtag \ vcl \ )) diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 0ecfa335b19c..4d5328c2335e 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp> #include <com/sun/star/script/XInvocation.hpp> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <com/sun/star/awt/XToolkit.hpp> #include <com/sun/star/awt/XExtendedToolkit.hpp> diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 30800a0c4628..9d926b107f8f 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <comphelper/string.hxx> namespace treeview { diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk b/xmloff/CppunitTest_xmloff_uxmloff.mk index 37959ad17966..4a5492c7e074 100644 --- a/xmloff/CppunitTest_xmloff_uxmloff.mk +++ b/xmloff/CppunitTest_xmloff_uxmloff.mk @@ -39,7 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,xmloff_uxmloff, \ comphelper \ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ sal \ salhelper \ sax \ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index e3777e482265..8994ff3d76d2 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,xo,\ comphelper \ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ sal \ salhelper \ sax \ diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx index 2511a9704e41..66605f503df2 100644 --- a/xmloff/inc/pch/precompiled_xo.hxx +++ b/xmloff/inc/pch/precompiled_xo.hxx @@ -498,8 +498,8 @@ #include <cppuhelper/implbase3.hxx> #include <cppuhelper/weakref.hxx> #include <functional> -#include <i18npool/languagetag.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> #include <iterator> #include <limits.h> #include <list> diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx index 678d9f26ae29..71a6a82af454 100644 --- a/xmloff/inc/xmloff/xmlnumfi.hxx +++ b/xmloff/inc/xmloff/xmlnumfi.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/xmlstyle.hxx> #include <rtl/ustrbuf.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <vector> #include <unotools/localedatawrapper.hxx> diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 0da8be653b9b..6bba79c777d6 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -18,7 +18,7 @@ */ #include <tools/debug.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <rtl/ustrbuf.hxx> #include <xmloff/xmlmetae.hxx> diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 362b5d94256b..c34a0e679794 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -21,8 +21,8 @@ #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <svl/numuno.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/debug.hxx> #include <rtl/math.hxx> #include <unotools/calendarwrapper.hxx> diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 3e2c5455a160..d2c589657085 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -26,7 +26,7 @@ #include <svl/zformat.hxx> #include <svl/numuno.hxx> #include <rtl/math.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/color.hxx> #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index bd0099681117..f441a1d309c8 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ utl \ vcl \ xo \ - i18nisolang1 \ + i18nlangtag \ $(gb_UWINAPI) \ )) |