Kaydet (Commit) 876c619b authored tarafından Eike Rathke's avatar Eike Rathke

new module i18nlangtag

Moved portions from module i18npool, all of former i18nisolang1 library
that now is i18nlangtag. Included are languagetag, isolang and mslangid.

This i18nlangtag code is now even used by module comphelper, so
disentangling i18npool and making this an own module was needed to not
create circular module dependencies.

Change-Id: Ib887c3d6dde667403fd22d382310ba5f1a9b0015
üst 8ef9e38a
......@@ -33,7 +33,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
comphelper \
cppu \
cppuhelper \
i18nisolang1 \
i18nlangtag \
sal \
salhelper \
tl \
......
......@@ -556,7 +556,7 @@ endif
$(eval $(call gb_Helper_register_libraries,RTLIBS, \
comphelper \
i18nisolang1 \
i18nlangtag \
i18nutil \
ucbhelper \
))
......
......@@ -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))
......
......@@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
cppu \
cppuhelper \
external \
i18npool \
i18nlangtag \
i18nutil \
idl \
idlc \
......
......@@ -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) \
......
......@@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_libraries,acc,\
cppu \
cppuhelper \
sal \
i18nisolang1 \
i18nlangtag \
sot \
svl \
svt \
......
......@@ -69,7 +69,7 @@ copy-stuff:
fastsax.uno \
frmlo \
gcc3_uno \
i18nisolang1gcc3 \
i18nlangtaggcc3 \
icudatalo \
icui18nlo \
iculelo \
......
......@@ -65,7 +65,7 @@ copy-stuff:
for F in $(strip \
comphelpgcc3 \
gcc3_uno \
i18nisolang1gcc3 \
i18nlangtaggcc3 \
icudatalo \
icui18nlo \
icuuclo \
......
......@@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
cppu \
cppuhelper \
sal \
i18nisolang1 \
i18nlangtag \
sfx \
svl \
svt \
......
......@@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,basctl,\
editeng \
fwe \
sal \
i18nisolang1 \
i18nlangtag \
sb \
sfx \
sot \
......
......@@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_coverage, \
utl \
vcl \
xmlscript \
i18nisolang1 \
i18nlangtag \
$(gb_UWINAPI) \
))
......
......@@ -21,7 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
cppuhelper \
sal \
salhelper \
i18nisolang1 \
i18nlangtag \
sb \
sot \
svl \
......
......@@ -21,7 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_vba, \
comphelper \
cppu \
cppuhelper \
i18nisolang1 \
i18nlangtag \
sal \
salhelper \
sb \
......
......@@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,sb,\
cppuhelper \
sal \
salhelper \
i18nisolang1 \
i18nlangtag \
sot \
svl \
svt \
......
......@@ -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>
......
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\
vcl \
tk \
tl \
i18nisolang1 \
i18nlangtag \
canvastools \
$(gb_UWINAPI) \
))
......
......@@ -62,7 +62,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\
vcl \
tl \
utl \
i18nisolang1 \
i18nlangtag \
$(gb_UWINAPI) \
))
......
......@@ -68,7 +68,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\
vcl \
tl \
utl \
i18nisolang1 \
i18nlangtag \
$(gb_UWINAPI) \
))
......
......@@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\
comphelper \
cppu \
cppuhelper \
i18nisolang1 \
i18nlangtag \
sal \
svt \
tk \
......
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
......@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
fileacc \
for \
forui \
i18nisolang1 \
i18nlangtag \
msfilter \
oox \
sal \
......
......@@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
drawinglayer \
editeng \
sal \
i18nisolang1 \
i18nlangtag \
sfx \
sot \
svl \
......
......@@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
drawinglayer \
editeng \
fwe \
i18nisolang1 \
i18nlangtag \
sal \
sfx \
svl \
......
......@@ -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;
......
......@@ -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>
//.............................................................................
......
......@@ -48,7 +48,7 @@ $(eval $(call gb_Library_use_libraries,comphelper,\
sal \
salhelper \
ucbhelper \
i18nisolang1 \
i18nlangtag \
$(gb_UWINAPI) \
))
......
......@@ -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 {
......
......@@ -74,7 +74,7 @@ $(eval $(call gb_Library_use_libraries,configmgr, \
sal \
salhelper \
xmlreader \
i18nisolang1 \
i18nlangtag \
$(gb_UWINAPI) \
))
......
......@@ -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"
......
......@@ -47,7 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_ado, \
cppu \
cppuhelper \
dbtools \
i18nisolang1 \
i18nlangtag \
ado \
sal \
salhelper \
......
......@@ -44,7 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \
comphelper \
cppu \
cppuhelper \
i18nisolang1 \
i18nlangtag \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
sal \
......
......@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_mork, \
comphelper \
cppu \
cppuhelper \
i18nisolang1 \
i18nlangtag \
mork \
sal \
salhelper \
......
......@@ -57,7 +57,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
utl \
tl \
comphelper \
i18nisolang1 \
i18nlangtag \
$(gb_UWINAPI) \
))
......
......@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_libraries,flat,\
tl \
svl \
utl \
i18nisolang1 \
i18nlangtag \
sal \
salhelper \
dbtools \
......
......@@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\
salhelper \
tl \
utl \
i18nisolang1 \
i18nlangtag \
$(gb_UWINAPI) \
))
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -40,7 +40,7 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\
comphelper \
cppu \
cppuhelper \
i18nisolang1 \
i18nlangtag \
sal \
svt \
tl \
......
......@@ -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>
......
......@@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,cui,\
cppuhelper \
drawinglayer \
editeng \
i18nisolang1 \
i18nlangtag \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmfwk) \
lng \
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -29,8 +29,8 @@
#include <vcl/configsettings.hxx>