[Libreoffice-commits] core.git: 2 commits - accessibility/Library_acc.mk android/qa avmedia/Library_avmedia.mk basctl/Library_basctl.mk basic/CppunitTest_basic_coverage.mk basic/CppunitTest_basic_scanner.mk basic/CppunitTest_basic_vba.mk basic/inc basic/Library_sb.mk basic/qa basic/source canvas/Library_cairocanvas.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Library_vclcanvas.mk canvas/source chart2/CppunitTest_chart2_importtest.mk chart2/Library_chartcontroller.mk chart2/Library_chartcore.mk chart2/source comphelper/Library_comphelper.mk comphelper/source configmgr/Library_configmgr.mk configmgr/source connectivity/CppunitTest_connectivity_ado.mk connectivity/CppunitTest_connectivity_commontools.mk connectivity/CppunitTest_connectivity_mork.mk connectivity/inc connectivity/Library_dbtools.mk connectivity/Library_flat.mk connectivity/Library_hsqldb.mk connectivity/source cppcanvas/Library_cppcanvas.mk cppcanvas/source cui/Library_cui.mk cui/source dbaccess/C ppunitTest_dbaccess_macros_test.mk dbaccess/inc dbaccess/Library_dba.mk dbaccess/Library_dbu.mk dbaccess/source desktop/Library_deploymentgui.mk desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/Library_migrationoo2.mk desktop/Library_sofficeapp.mk desktop/Library_unopkgapp.mk desktop/Pagein_common.mk desktop/source dictionaries drawinglayer/inc drawinglayer/Library_drawinglayer.mk drawinglayer/source editeng/CppunitTest_editeng_borderline.mk editeng/CppunitTest_editeng_core.mk editeng/CppunitTest_editeng_lookuptree.mk editeng/inc editeng/Library_editeng.mk editeng/source extensions/Library_abp.mk extensions/Library_bib.mk extensions/Library_dbp.mk extensions/Library_pcr.mk extensions/Library_res.mk extensions/Library_scn.mk extensions/Library_updatecheckui.mk extensions/source extensions/StaticLibrary_plugcon.mk filter/inc filter/Library_eps.mk filter/Library_filterconfig.mk filter/Library_flash.mk filter/Library_graphicfilter.mk filter/Library_pdffilt er.mk filter/Library_svgfilter.mk filter/Library_t602filter.mk filter/Library_xsltdlg.mk filter/source forms/Library_frm.mk forms/source formula/Library_for.mk formula/Library_forui.mk fpicker/Library_fps_aqua.mk fpicker/Library_fps.mk fpicker/Library_fps_office.mk framework/inc framework/Library_fwe.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/source helpcontent2 i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk i18nlangtag/inc i18nlangtag/Library_i18nlangtag.mk i18nlangtag/Makefile i18nlangtag/Module_i18nlangtag.mk i18nlangtag/Package_inc.mk i18nlangtag/qa i18nlangtag/README i18nlangtag/source i18npool/CppunitTest_i18npool_test_languagetag.mk i18npool/inc i18npool/Library_i18nisolang1.mk i18npool/Library_i18npool.mk i18npool/Library_i18nsearch.mk i18npool/Module_i18npool.mk i18npool/Package_inc.mk i18npool/qa i18npool/source ios/qa Library_merged.mk lingucomponent/Library_hyphen.mk lingucomponent/Library_lnth.mk lingucompone nt/Library_MacOSXSpell.mk lingucomponent/Library_spell.mk lingucomponent/source lingucomponent/StaticLibrary_ulingu.mk linguistic/inc linguistic/Library_lng.mk linguistic/source lotuswordpro/Library_lwpft.mk oox/Library_oox.mk padmin/Library_spa.mk padmin/source reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/source RepositoryFixes.mk Repository.mk RepositoryModule_build.mk RepositoryModule_host.mk rsc/Executable_rsc.mk rsc/source sal/inc scaddins/Library_analysis.mk scaddins/Library_date.mk scaddins/Library_pricing.mk sccomp/Library_solver.mk sc/CppunitTest_sc_annotationobj.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_annotationsobj.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_filters_test.m k sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_modelobj.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_outlineobj.mk sc/CppunitTest_sc_rangelst_test.mk sc/CppunitTest_sc_subsequent_export_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_ucalc.mk sc/inc sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scui.mk scp2/source scripting/Library_dlgprov.mk sc/source sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_regression_test.mk sd/CppunitTest_sd_uimpress.mk sdext/StaticLibrary_pdfimport_s.mk sd/inc sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk sd/source sfx2/inc sfx2/Library_qstart.mk sfx2/Library_sfx.mk sfx2/source shell/Executable_lngconvex.mk shell/source solenv/gbuild sot/Library_sot.mk starmath/CppunitTest_starmath_qa_cppunit.mk starmath/inc starmath/Library_sm.mk starmath/sou rce svl/CppunitTest_svl_qa_cppunit.mk svl/CppunitTest_svl_urihelper.mk svl/inc svl/Library_svl.mk svl/qa svl/source svtools/AllLangResTarget_svt.mk svtools/Executable_langsupport.mk svtools/inc svtools/langsupport svtools/Library_svt.mk svtools/source svx/inc svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk svx/source sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_layout_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_rtfimport.mk sw/CppunitTest_sw_uwriter.mk sw/inc sw/Library_msword.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk sw/source test/Library_subsequenttest.mk test/Library_test.mk toolkit/Library_tk.mk tools/inc tools/Library_tl.mk tools/source unotools/inc unotools/Library_utl.mk unotools/source uui/Library_uui.mk vcl/generic vcl/inc vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vcl plug_kde.mk vcl/Library_vclplug_svp.mk vcl/Library_vclplug_tde.mk vcl/source vcl/StaticLibrary_headless.mk vcl/unx vcl/win writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source xmlhelp/Library_tvhlp1.mk xmlhelp/Library_ucpchelp1.mk xmlhelp/source xmloff/CppunitTest_xmloff_uxmloff.mk xmloff/inc xmloff/Library_xo.mk xmloff/source xmlsecurity/Library_xmlsecurity.mk
Eike Rathke
erack at redhat.com
Fri Apr 5 10:11:56 PDT 2013
Library_merged.mk | 2
Repository.mk | 2
RepositoryFixes.mk | 2
RepositoryModule_build.mk | 2
RepositoryModule_host.mk | 1
accessibility/Library_acc.mk | 2
android/qa/sc/Makefile | 2
android/qa/simple/Makefile | 2
avmedia/Library_avmedia.mk | 2
basctl/Library_basctl.mk | 2
basic/CppunitTest_basic_coverage.mk | 2
basic/CppunitTest_basic_scanner.mk | 2
basic/CppunitTest_basic_vba.mk | 2
basic/Library_sb.mk | 2
basic/inc/basic/sbxbase.hxx | 2
basic/qa/cppunit/basic_coverage.cxx | 2
basic/source/classes/global.cxx | 2
basic/source/inc/runtime.hxx | 2
basic/source/runtime/methods.cxx | 2
basic/source/sbx/sbxdate.cxx | 2
canvas/Library_cairocanvas.mk | 2
canvas/Library_directx9canvas.mk | 2
canvas/Library_gdipluscanvas.mk | 2
canvas/Library_vclcanvas.mk | 2
canvas/source/cairo/cairo_canvasfont.cxx | 2
canvas/source/directx/dx_textlayout_drawhelper.cxx | 2
canvas/source/vcl/canvasfont.cxx | 2
chart2/CppunitTest_chart2_importtest.mk | 2
chart2/Library_chartcontroller.mk | 2
chart2/Library_chartcore.mk | 2
chart2/source/tools/CharacterProperties.cxx | 4
chart2/source/tools/NumberFormatterWrapper.cxx | 2
comphelper/Library_comphelper.mk | 1
comphelper/source/misc/configuration.cxx | 28
configmgr/Library_configmgr.mk | 2
configmgr/source/configurationprovider.cxx | 6
connectivity/CppunitTest_connectivity_ado.mk | 2
connectivity/CppunitTest_connectivity_commontools.mk | 2
connectivity/CppunitTest_connectivity_mork.mk | 2
connectivity/Library_dbtools.mk | 2
connectivity/Library_flat.mk | 2
connectivity/Library_hsqldb.mk | 2
connectivity/inc/pch/precompiled_file.hxx | 2
connectivity/inc/pch/precompiled_flat.hxx | 2
connectivity/source/commontools/formattedcolumnvalue.cxx | 4
connectivity/source/drivers/file/fcode.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 2
cppcanvas/Library_cppcanvas.mk | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 2
cui/Library_cui.mk | 2
cui/source/dialogs/SpellAttrib.hxx | 2
cui/source/dialogs/thesdlg.cxx | 2
cui/source/options/optasian.cxx | 2
cui/source/options/optgdlg.cxx | 4
cui/source/options/optgenrl.cxx | 2
cui/source/options/optlingu.cxx | 2
cui/source/tabpages/numfmt.cxx | 2
cui/source/tabpages/numpages.cxx | 2
dbaccess/CppunitTest_dbaccess_macros_test.mk | 2
dbaccess/Library_dba.mk | 2
dbaccess/Library_dbu.mk | 2
dbaccess/inc/pch/precompiled_dbu.hxx | 2
dbaccess/source/core/misc/userinformation.cxx | 2
dbaccess/source/ui/misc/DExport.cxx | 2
desktop/Library_deployment.mk | 2
desktop/Library_deploymentgui.mk | 2
desktop/Library_deploymentmisc.mk | 2
desktop/Library_migrationoo2.mk | 2
desktop/Library_sofficeapp.mk | 2
desktop/Library_unopkgapp.mk | 2
desktop/Pagein_common.mk | 2
desktop/source/app/langselect.cxx | 4
desktop/source/app/userinstall.cxx | 2
desktop/source/deployment/gui/dp_gui_service.cxx | 2
desktop/source/deployment/gui/license_dialog.cxx | 2
desktop/source/deployment/inc/dp_resource.h | 2
desktop/source/deployment/misc/dp_resource.cxx | 2
desktop/source/migration/migration.cxx | 2
desktop/source/pkgchk/unopkg/unopkg_shared.h | 2
dictionaries | 2
drawinglayer/Library_drawinglayer.mk | 2
drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx | 2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 2
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2
drawinglayer/source/processor2d/getdigitlanguage.cxx | 2
drawinglayer/source/processor2d/getdigitlanguage.hxx | 2
editeng/CppunitTest_editeng_borderline.mk | 2
editeng/CppunitTest_editeng_core.mk | 2
editeng/CppunitTest_editeng_lookuptree.mk | 2
editeng/Library_editeng.mk | 2
editeng/inc/editeng/SpellPortions.hxx | 2
editeng/inc/editeng/editeng.hxx | 2
editeng/inc/editeng/editstat.hxx | 2
editeng/inc/editeng/editview.hxx | 2
editeng/inc/editeng/edtdlg.hxx | 2
editeng/inc/editeng/flditem.hxx | 2
editeng/inc/editeng/hangulhanja.hxx | 2
editeng/inc/editeng/langitem.hxx | 2
editeng/inc/editeng/outliner.hxx | 2
editeng/inc/editeng/svxacorr.hxx | 2
editeng/inc/editeng/svxfont.hxx | 2
editeng/inc/editeng/unoedsrc.hxx | 2
editeng/inc/editeng/unolingu.hxx | 2
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/editview.cxx | 4
editeng/source/editeng/impedit.hxx | 2
editeng/source/editeng/impedit3.cxx | 2
editeng/source/editeng/impedit4.cxx | 2
editeng/source/items/textitem.cxx | 2
editeng/source/misc/svxacorr.cxx | 2
editeng/source/misc/unolingu.cxx | 2
editeng/source/outliner/outlvw.cxx | 2
extensions/Library_abp.mk | 2
extensions/Library_bib.mk | 2
extensions/Library_dbp.mk | 2
extensions/Library_pcr.mk | 2
extensions/Library_res.mk | 2
extensions/Library_scn.mk | 2
extensions/Library_updatecheckui.mk | 2
extensions/StaticLibrary_plugcon.mk | 2
extensions/source/propctrlr/standardcontrol.cxx | 2
filter/Library_eps.mk | 2
filter/Library_filterconfig.mk | 2
filter/Library_flash.mk | 2
filter/Library_graphicfilter.mk | 2
filter/Library_pdffilter.mk | 2
filter/Library_svgfilter.mk | 2
filter/Library_t602filter.mk | 2
filter/Library_xsltdlg.mk | 2
filter/inc/filter/msfilter/countryid.hxx | 2
filter/source/config/cache/filtercache.cxx | 2
filter/source/svg/svgexport.cxx | 2
forms/Library_frm.mk | 2
forms/source/component/FormattedField.cxx | 2
formula/Library_for.mk | 2
formula/Library_forui.mk | 2
fpicker/Library_fps.mk | 2
fpicker/Library_fps_aqua.mk | 2
fpicker/Library_fps_office.mk | 2
framework/Library_fwe.mk | 2
framework/Library_fwi.mk | 2
framework/Library_fwk.mk | 2
framework/Library_fwl.mk | 2
framework/inc/helper/mischelper.hxx | 2
framework/inc/services/substitutepathvars.hxx | 2
framework/source/accelerators/documentacceleratorconfiguration.cxx | 2
framework/source/accelerators/globalacceleratorconfiguration.cxx | 2
framework/source/accelerators/presethandler.cxx | 2
framework/source/fwi/helper/mischelper.cxx | 2
framework/source/inc/accelerators/presethandler.hxx | 2
framework/source/services/substitutepathvars.cxx | 2
framework/source/uielement/langselectionmenucontroller.cxx | 2
framework/source/uielement/langselectionstatusbarcontroller.cxx | 2
helpcontent2 | 2
i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk | 49
i18nlangtag/Library_i18nlangtag.mk | 71
i18nlangtag/Makefile | 14
i18nlangtag/Module_i18nlangtag.mk | 20
i18nlangtag/Package_inc.mk | 36
i18nlangtag/README | 3
i18nlangtag/inc/i18nlangtag/i18nlangtagdllapi.h | 34
i18nlangtag/inc/i18nlangtag/lang.h | 568 ++++
i18nlangtag/inc/i18nlangtag/languagetag.hxx | 400 +++
i18nlangtag/inc/i18nlangtag/mslangid.hxx | 309 ++
i18nlangtag/qa/cppunit/test_languagetag.cxx | 353 ++
i18nlangtag/source/isolang/insys.cxx | 35
i18nlangtag/source/isolang/inunx.cxx | 139 +
i18nlangtag/source/isolang/inwnt.cxx | 104
i18nlangtag/source/isolang/isolang.cxx | 1085 ++++++++
i18nlangtag/source/isolang/langid.pl | 409 +++
i18nlangtag/source/isolang/lcid.awk | 187 +
i18nlangtag/source/isolang/mslangid.cxx | 492 +++
i18nlangtag/source/languagetag/languagetag.cxx | 1254 ++++++++++
i18nlangtag/source/languagetag/simple-langtag.cxx | 400 +++
i18npool/CppunitTest_i18npool_test_languagetag.mk | 49
i18npool/Library_i18nisolang1.mk | 71
i18npool/Library_i18npool.mk | 2
i18npool/Library_i18nsearch.mk | 2
i18npool/Module_i18npool.mk | 3
i18npool/Package_inc.mk | 36
i18npool/inc/i18npool/i18npooldllapi.h | 41
i18npool/inc/i18npool/lang.h | 568 ----
i18npool/inc/i18npool/languagetag.hxx | 400 ---
i18npool/inc/i18npool/mslangid.hxx | 309 --
i18npool/qa/cppunit/test_languagetag.cxx | 353 --
i18npool/source/isolang/insys.cxx | 35
i18npool/source/isolang/inunx.cxx | 139 -
i18npool/source/isolang/inwnt.cxx | 104
i18npool/source/isolang/isolang.cxx | 1085 --------
i18npool/source/isolang/langid.pl | 409 ---
i18npool/source/isolang/lcid.awk | 187 -
i18npool/source/isolang/mslangid.cxx | 492 ---
i18npool/source/languagetag/languagetag.cxx | 1254 ----------
i18npool/source/languagetag/simple-langtag.cxx | 400 ---
i18npool/source/localedata/localedata.cxx | 2
i18npool/source/nativenumber/nativenumbersupplier.cxx | 2
ios/qa/sc/Makefile | 2
lingucomponent/Library_MacOSXSpell.mk | 2
lingucomponent/Library_hyphen.mk | 2
lingucomponent/Library_lnth.mk | 2
lingucomponent/Library_spell.mk | 2
lingucomponent/StaticLibrary_ulingu.mk | 2
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 2
lingucomponent/source/lingutil/lingutil.cxx | 4
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2
linguistic/Library_lng.mk | 2
linguistic/inc/iprcache.hxx | 2
linguistic/inc/linguistic/misc.hxx | 2
linguistic/source/convdic.cxx | 2
linguistic/source/convdicxml.cxx | 2
linguistic/source/dicimp.cxx | 4
linguistic/source/dlistimp.cxx | 2
linguistic/source/gciterator.cxx | 2
linguistic/source/hhconvdic.cxx | 2
linguistic/source/hyphdsp.cxx | 2
linguistic/source/lngopt.cxx | 2
linguistic/source/lngsvcmgr.cxx | 4
linguistic/source/misc.cxx | 2
linguistic/source/thesdsp.cxx | 2
lotuswordpro/Library_lwpft.mk | 2
oox/Library_oox.mk | 2
padmin/Library_spa.mk | 2
padmin/source/helper.cxx | 2
reportdesign/Library_rpt.mk | 2
reportdesign/Library_rptui.mk | 2
reportdesign/source/core/api/ReportComponent.cxx | 4
reportdesign/source/ui/misc/UITools.cxx | 2
rsc/Executable_rsc.mk | 2
rsc/source/parser/rscdb.cxx | 2
rsc/source/parser/rscibas.cxx | 4
sal/inc/sal/log-areas.dox | 5
sc/CppunitTest_sc_annotationobj.mk | 2
sc/CppunitTest_sc_annotationshapeobj.mk | 2
sc/CppunitTest_sc_annotationsobj.mk | 2
sc/CppunitTest_sc_cellrangeobj.mk | 2
sc/CppunitTest_sc_chart_regression_test.mk | 2
sc/CppunitTest_sc_databaserangeobj.mk | 2
sc/CppunitTest_sc_datapilotfieldobj.mk | 2
sc/CppunitTest_sc_datapilottableobj.mk | 2
sc/CppunitTest_sc_editfieldobj_cell.mk | 2
sc/CppunitTest_sc_editfieldobj_header.mk | 2
sc/CppunitTest_sc_filters_test.mk | 2
sc/CppunitTest_sc_macros_test.mk | 2
sc/CppunitTest_sc_modelobj.mk | 2
sc/CppunitTest_sc_namedrangeobj.mk | 2
sc/CppunitTest_sc_namedrangesobj.mk | 2
sc/CppunitTest_sc_outlineobj.mk | 2
sc/CppunitTest_sc_rangelst_test.mk | 2
sc/CppunitTest_sc_subsequent_export_test.mk | 2
sc/CppunitTest_sc_subsequent_filters_test.mk | 2
sc/CppunitTest_sc_tableautoformatfield.mk | 2
sc/CppunitTest_sc_tablesheetobj.mk | 2
sc/CppunitTest_sc_tablesheetsobj.mk | 2
sc/CppunitTest_sc_ucalc.mk | 2
sc/Library_sc.mk | 2
sc/Library_scfilt.mk | 2
sc/Library_scui.mk | 2
sc/inc/addincol.hxx | 2
sc/inc/convuno.hxx | 2
sc/inc/global.hxx | 2
sc/inc/pch/precompiled_sc.hxx | 10
sc/inc/scabstdlg.hxx | 2
sc/inc/stringutil.hxx | 2
sc/inc/zforauto.hxx | 2
sc/source/core/data/drwlayer.cxx | 2
sc/source/core/data/global.cxx | 2
sc/source/core/data/stlpool.cxx | 2
sc/source/core/tool/addincol.cxx | 2
sc/source/core/tool/cellkeytranslator.cxx | 4
sc/source/filter/inc/xlroot.hxx | 2
sc/source/filter/xml/xmlcelli.cxx | 2
sc/source/ui/app/scmod2.cxx | 4
sc/source/ui/dbgui/tpsort.cxx | 2
sc/source/ui/docshell/impex.cxx | 2
sc/source/ui/inc/asciiopt.hxx | 2
sc/source/ui/inc/textimportoptions.hxx | 2
sc/source/ui/unoobj/convuno.cxx | 2
sc/source/ui/unoobj/defltuno.cxx | 2
sc/source/ui/unoobj/filtuno.cxx | 2
scaddins/Library_analysis.mk | 2
scaddins/Library_date.mk | 2
scaddins/Library_pricing.mk | 2
sccomp/Library_solver.mk | 2
scp2/source/ooo/file_library_ooo.scp | 4
scripting/Library_dlgprov.mk | 2
sd/CppunitTest_sd_filters_test.mk | 2
sd/CppunitTest_sd_regression_test.mk | 2
sd/CppunitTest_sd_uimpress.mk | 2
sd/Library_sd.mk | 2
sd/Library_sdfilt.mk | 2
sd/Library_sdui.mk | 2
sd/inc/pch/precompiled_sd.hxx | 4
sd/source/core/drawdoc.cxx | 4
sd/source/core/drawdoc4.cxx | 2
sd/source/filter/eppt/epptso.cxx | 2
sd/source/ui/dlg/headerfooterdlg.cxx | 2
sd/source/ui/presenter/PresenterTextView.cxx | 2
sd/source/ui/unoidl/unopool.cxx | 2
sd/source/ui/view/drtxtob.cxx | 2
sdext/StaticLibrary_pdfimport_s.mk | 2
sfx2/Library_qstart.mk | 2
sfx2/Library_sfx.mk | 2
sfx2/inc/sfx2/sfxhtml.hxx | 2
sfx2/source/appl/linkmgr2.cxx | 2
shell/Executable_lngconvex.mk | 2
shell/source/tools/lngconvex/lngconvex.cxx | 2
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2
sot/Library_sot.mk | 2
starmath/CppunitTest_starmath_qa_cppunit.mk | 2
starmath/Library_sm.mk | 2
starmath/inc/pch/precompiled_sm.hxx | 2
starmath/source/parse.cxx | 2
svl/CppunitTest_svl_qa_cppunit.mk | 2
svl/CppunitTest_svl_urihelper.mk | 4
svl/Library_svl.mk | 2
svl/inc/svl/inettype.hxx | 2
svl/inc/svl/languageoptions.hxx | 2
svl/inc/svl/ondemand.hxx | 2
svl/inc/svl/sfontitm.hxx | 2
svl/inc/svl/zforlist.hxx | 2
svl/inc/svl/zformat.hxx | 4
svl/qa/unit/svl.cxx | 2
svl/source/config/cjkoptions.cxx | 2
svl/source/config/ctloptions.cxx | 2
svl/source/config/languageoptions.cxx | 4
svl/source/items/srchitem.cxx | 2
svl/source/misc/getstringresource.cxx | 2
svl/source/numbers/numfmuno.cxx | 2
svl/source/numbers/supservs.cxx | 2
svl/source/numbers/zforlist.cxx | 2
svl/source/numbers/zformat.cxx | 2
svl/source/numbers/zforscan.cxx | 2
svl/source/numbers/zforscan.hxx | 2
svtools/AllLangResTarget_svt.mk | 2
svtools/Executable_langsupport.mk | 2
svtools/Library_svt.mk | 2
svtools/inc/pch/precompiled_svt.hxx | 6
svtools/inc/svtools/langtab.hxx | 2
svtools/inc/svtools/sampletext.hxx | 2
svtools/langsupport/langsupport.cxx | 2
svtools/source/control/ctrltool.cxx | 2
svtools/source/control/fmtfield.cxx | 2
svtools/source/misc/langtab.cxx | 6
svtools/source/misc/langtab.src | 2
svx/Library_svx.mk | 2
svx/Library_svxcore.mk | 2
svx/Library_textconversiondlgs.mk | 2
svx/inc/pch/precompiled_svx.hxx | 2
svx/inc/pch/precompiled_svxcore.hxx | 4
svx/inc/svx/numfmtsh.hxx | 2
svx/source/dialog/langbox.cxx | 4
svx/source/dialog/svxbmpnumvalueset.cxx | 2
svx/source/fmcomp/gridcell.cxx | 2
svx/source/form/fmcontrollayout.cxx | 4
svx/source/items/numfmtsh.cxx | 2
svx/source/svdraw/svdetc.cxx | 2
sw/CppunitTest_sw_filters_test.mk | 2
sw/CppunitTest_sw_layout_test.mk | 2
sw/CppunitTest_sw_macros_test.mk | 2
sw/CppunitTest_sw_rtfimport.mk | 2
sw/CppunitTest_sw_uwriter.mk | 2
sw/Library_msword.mk | 2
sw/Library_sw.mk | 2
sw/Library_swui.mk | 2
sw/Library_vbaswobj.mk | 2
sw/inc/EnhancedPDFExportHelper.hxx | 2
sw/inc/breakit.hxx | 2
sw/inc/extinput.hxx | 2
sw/inc/fldbas.hxx | 2
sw/inc/pch/precompiled_msword.hxx | 6
sw/inc/pch/precompiled_sw.hxx | 8
sw/inc/splargs.hxx | 2
sw/inc/swcalwrp.hxx | 2
sw/inc/swscanner.hxx | 2
sw/inc/swtypes.hxx | 2
sw/inc/tox.hxx | 2
sw/source/core/crsr/findattr.cxx | 2
sw/source/core/doc/poolfmt.cxx | 2
sw/source/core/doc/sortopt.cxx | 2
sw/source/core/inc/swfont.hxx | 2
sw/source/core/inc/txmsrt.hxx | 2
sw/source/core/text/EnhancedPDFExportHelper.cxx | 2
sw/source/core/text/porlay.cxx | 2
sw/source/core/text/portxt.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 2
sw/source/filter/basflt/fltini.cxx | 4
sw/source/filter/html/css1atr.cxx | 2
sw/source/filter/html/htmlcss1.cxx | 2
sw/source/filter/html/htmlgrin.cxx | 2
sw/source/filter/html/svxcss1.cxx | 2
sw/source/filter/html/wrthtml.cxx | 2
sw/source/filter/html/wrthtml.hxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/writerwordglue.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 4
sw/source/ui/app/appopt.cxx | 4
sw/source/ui/app/docshini.cxx | 2
sw/source/ui/config/fontcfg.cxx | 2
sw/source/ui/dbui/dbmgr.cxx | 2
sw/source/ui/dialog/ascfldlg.cxx | 2
sw/source/ui/docvw/PostItMgr.cxx | 4
sw/source/ui/inc/fontcfg.hxx | 2
sw/source/ui/lingu/olmenu.cxx | 4
sw/source/ui/shells/annotsh.cxx | 2
sw/source/ui/shells/drwtxtex.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 2
sw/source/ui/shells/textsh1.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 2
sw/source/ui/utlui/numfmtlb.cxx | 2
sw/source/ui/vba/vbastyle.cxx | 2
test/Library_subsequenttest.mk | 2
test/Library_test.mk | 2
toolkit/Library_tk.mk | 2
tools/Library_tl.mk | 2
tools/inc/tools/rc.hxx | 2
tools/inc/tools/resmgr.hxx | 2
tools/inc/tools/simplerm.hxx | 2
tools/source/rc/resmgr.cxx | 4
unotools/Library_utl.mk | 2
unotools/inc/unotools/charclass.hxx | 2
unotools/inc/unotools/intlwrapper.hxx | 4
unotools/inc/unotools/lingucfg.hxx | 2
unotools/inc/unotools/localedatawrapper.hxx | 2
unotools/inc/unotools/syslocale.hxx | 2
unotools/inc/unotools/syslocaleoptions.hxx | 4
unotools/inc/unotools/textsearch.hxx | 2
unotools/inc/unotools/transliterationwrapper.hxx | 2
unotools/source/config/fontcfg.cxx | 2
unotools/source/config/lingucfg.cxx | 4
unotools/source/config/syslocaleoptions.cxx | 4
unotools/source/i18n/intlwrapper.cxx | 2
unotools/source/i18n/localedatawrapper.cxx | 2
unotools/source/i18n/textsearch.cxx | 2
unotools/source/i18n/transliterationwrapper.cxx | 2
uui/Library_uui.mk | 2
vcl/Library_desktop_detector.mk | 2
vcl/Library_vcl.mk | 2
vcl/Library_vclplug_gen.mk | 2
vcl/Library_vclplug_gtk.mk | 2
vcl/Library_vclplug_gtk3.mk | 2
vcl/Library_vclplug_kde.mk | 2
vcl/Library_vclplug_kde4.mk | 2
vcl/Library_vclplug_svp.mk | 2
vcl/Library_vclplug_tde.mk | 2
vcl/StaticLibrary_headless.mk | 2
vcl/generic/fontmanager/fontconfig.cxx | 2
vcl/generic/fontmanager/fontmanager.cxx | 2
vcl/generic/glyphs/gcach_layout.cxx | 2
vcl/generic/glyphs/graphite_serverfont.cxx | 2
vcl/generic/print/genpspgraphics.cxx | 2
vcl/inc/impfont.hxx | 2
vcl/inc/outfont.hxx | 2
vcl/inc/pch/precompiled_vcl.hxx | 10
vcl/inc/salwtype.hxx | 2
vcl/inc/unx/i18n_ic.hxx | 2
vcl/inc/vcl/font.hxx | 2
vcl/inc/vcl/i18nhelp.hxx | 2
vcl/inc/vcl/pdfwriter.hxx | 2
vcl/inc/vcl/settings.hxx | 2
vcl/source/app/i18nhelp.cxx | 2
vcl/source/app/settings.cxx | 4
vcl/source/app/svapp.cxx | 2
vcl/source/control/field2.cxx | 2
vcl/source/gdi/outdev3.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/gdi/sallayout.cxx | 2
vcl/source/window/mnemonic.cxx | 2
vcl/source/window/window.cxx | 2
vcl/unx/generic/gdi/salgdi3.cxx | 2
vcl/win/source/gdi/salgdi3.cxx | 2
vcl/win/source/gdi/winlayout.cxx | 2
writerfilter/Library_writerfilter.mk | 2
writerfilter/inc/pch/precompiled_writerfilter.hxx | 2
writerfilter/source/dmapper/DomainMapper.cxx | 2
xmlhelp/Library_tvhlp1.mk | 2
xmlhelp/Library_ucpchelp1.mk | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 2
xmlhelp/source/treeview/tvread.cxx | 2
xmloff/CppunitTest_xmloff_uxmloff.mk | 2
xmloff/Library_xo.mk | 2
xmloff/inc/pch/precompiled_xo.hxx | 4
xmloff/inc/xmloff/xmlnumfi.hxx | 2
xmloff/source/meta/xmlmetae.cxx | 2
xmloff/source/style/xmlnumfe.cxx | 4
xmloff/source/style/xmlnumfi.cxx | 2
xmlsecurity/Library_xmlsecurity.mk | 2
491 files changed, 6474 insertions(+), 6464 deletions(-)
New commits:
commit 876c619b944dfbc88464045f1400c549a01a1164
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 5 18:40:39 2013 +0200
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
diff --git a/Library_merged.mk b/Library_merged.mk
index fb29c94..ec83497 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 a9262a7..b45782c 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 0965714..733b52a 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 bc55322..ce8d0c1 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 1d20b5f..be634fd 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 0188b08..d188251 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 7501fa6..2734b51 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 7e21773..150c080 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 f77da34..d308f3e 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 1025df8..4e7d1d7 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 55906f5..52585fb 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 bd566af..ec0c928 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 25f41f3..9d61671 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 8412735..3568056 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 7b088be..16484ee 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 ea2969a..56b9ab6 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 43a3414..3862bfb 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 b1ba55b2..fd0911a 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 f368ee2..703f6d2 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 f28c585..40896b2 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 f276390..b76c35b 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 98300e1..6c29dcf 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 c320ab2..92b1754 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 0a27cea..a31bf1b 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 5541e72..e4e8d24 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 a73cda2..62a124b 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 c314e5d..549cf3e 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 c15973a..e67d5b3 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 7025166..601bdc7 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 4ccb9c7..66fbfda 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 b04390e..241f08a 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 918c73c..508e271 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 0c01ca2..b944858 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 7e43bf1..2935c4b 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 3cc6bee..2e96372 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 f4c04a0..d0afa62 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 e8e5a01..33d78aa 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 3ececdd..4c2e77e 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 68420d9..f4e31d5 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 2d65ea9..7678f2e 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 a5bc6e7..153db8f 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 7c0fe61..167a63a 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 18e25b4..16451d0 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 e83aa35..cc50875 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 a354ab9..f079083 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 beea43d..1712d5a 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 781a49e..570dab6 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 695c593..9126a81 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 57c394e..51a5861 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 b466080..3ab4ba5 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 c5e8609..7a0bfae 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 0be71ef..54a5c1a 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 6e04e19..56b0185 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 50bfe4d..66984ca 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 d9f2146..d495a24 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 d2e3a11..934f0c8 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 d7e68f8..8d5bbb1 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 67dce81..f208845 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 f7c8aab..f0a6e2d 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 4db6c71..24cdf3a 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 2ed4009..d8f40b7 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 fbb385d..697a910 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 7c082ad..4826fec 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 fc4e96a..5ab2f2a 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 9ba2dd7..fb40398 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 dc30097..65596af 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 0dfa88f..ec90d21 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 f0c01dc..c095257 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 89b73d3..7fd2a89 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 5ae66d2..a82d2da 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 8f79d0f..b078da4 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 450db26..e320d1b 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 5ac1b09..09f0ef9 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 2a0aba9..4a5bb4e 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 f81bf57..38abdb6 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 2dc584f..ccd57d2 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 9f91878..78bf426 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 c7acb75..0100632 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 56400e0..cc4eb29 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 4340e9f8..f063cf6 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
index 26b7c42..36776c3 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 26b7c425b0cecaad38249bfdc17b8d5cecee2670
+Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index daa522a..83058fa 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 690924f..5dea3b4 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 5ef4929..3051968 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 6640999..69f042e 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 012b39c..118b487 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 1f186f6..984000c 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 c854710..354b9cf 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 d8ede2e..fb43b8e 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 1574558..4b0ebdb 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 d21e9a1..bab7ffe 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 cbfe086..d8ca7f9 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 6161671..83ba643 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 ac45a7f..1752679 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 e84224a..f3cad0e 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 6dda134..40cdd5d 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 d3f2b36..8f75e0c 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 d88d392..4381d75 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 ff78d9d..8a64974 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 7df693b..9f9c419 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 26d1ae5..f74c2f7 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 ec4e77a..8581574 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 bb5044c..9e5bba2 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 afbaec2..09f5702 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 27c9716..57d1434 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 d992a1f..7a2f349 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 539be93..87a3d4b 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 dbaf736..8961791 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 1e4ffdb..f96d83e 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 cbc0272..87134db 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 cdc9d2e..fe5981e 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 e5b9516..64f65db 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 015dd35..d6c07e3 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 c8d0570..3d9a753 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 d12adec..0166455 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 42ea5a0..51c2953 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 2dde30a..243be5f 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 e713a55..7bc69cf 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 be21b78..4b0c688 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 bc3cdc5..90a7443 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 e5b27af..858e493 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 b90a4a1..fcaa26b 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 ea757b8..9082133 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 577167d..1fb2648 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 d3fc330..f3ea273 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 223121e..b4201f1 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 e1fb40a..b3a62d7 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 b635c88..8bbdd60 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 dae8f62..8e7081f 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 0c59e01..6e31333 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 5b1792b..b70f649 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 2ca1296..9551329 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 4b952c4..f26f1f8 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 c7b0f5e..8ec6f0b 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 42ed48f..d217a80 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 9145f52..d746487 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 0706a40..7573373 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 6311b85..ed9cac4 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 ada788d..bd1f0bb 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 f9c69ea..f94453e 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 9fd6ec8..482dac4 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 150bd0c..6fcd6d2 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 bf9a397..b1b1660 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 1ef5099..fb8b385 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 f74f69a..2db48ff 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 532ba18..65ebcc3 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 9ef571f..82ffbe6 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 8389028..dd3e355 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 304f92f..39b9773 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 5245808..b8a43a8 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 d5325f9..19853be 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 e26f99a..cdb13ab 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 e3e3669..eb6ad5b 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 5c87d7a..cf9b635 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
index 2e1a9ca..368e41d 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2e1a9cae55c82ba0faefc4b7d41b902e90ec6c27
+Subproject commit 368e41dfa3f5f1d0cd04c9605cf36db49b9d03b3
diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
new file mode 100644
index 0000000..0bed7f5
--- /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/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk
new file mode 100644
index 0000000..2f5efa0
--- /dev/null
+++ b/i18nlangtag/Library_i18nlangtag.mk
@@ -0,0 +1,71 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,i18nlangtag))
+
+$(eval $(call gb_Library_use_packages,i18nlangtag,\
+ cppu_odk_headers \
+ i18nlangtag_inc \
+))
+
+$(eval $(call gb_Library_set_include,i18nlangtag,\
+ -I$(SRCDIR)/i18nlangtag/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_use_sdk_api,i18nlangtag))
+
+$(eval $(call gb_Library_add_defs,i18nlangtag,\
+ -DI18NLANGTAG_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_use_libraries,i18nlangtag,\
+ sal \
+ $(gb_UWINAPI) \
+))
+
+$(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,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 \
+ ) \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18nlangtag/Makefile b/i18nlangtag/Makefile
new file mode 100644
index 0000000..0997e62
--- /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 0000000..c16f50f
--- /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/i18nlangtag/Package_inc.mk b/i18nlangtag/Package_inc.mk
new file mode 100644
index 0000000..984faf4
--- /dev/null
+++ b/i18nlangtag/Package_inc.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,i18nlangtag_inc,$(SRCDIR)/i18nlangtag/inc))
+
+$(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 0000000..88ca43b
--- /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/i18nlangtag/inc/i18nlangtag/i18nlangtagdllapi.h b/i18nlangtag/inc/i18nlangtag/i18nlangtagdllapi.h
new file mode 100644
index 0000000..ba9af35
--- /dev/null
+++ b/i18nlangtag/inc/i18nlangtag/i18nlangtagdllapi.h
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_I18NLANGTAG_I18NLANGTAGDLLAPI_H
+#define INCLUDED_I18NLANGTAG_I18NLANGTAGDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(I18NLANGTAG_DLLIMPLEMENTATION)
+#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define I18NLANGTAG_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_I18NLANGTAG_I18NLANGTAGDLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18nlangtag/inc/i18nlangtag/lang.h b/i18nlangtag/inc/i18nlangtag/lang.h
new file mode 100644
index 0000000..d4f5ca7
--- /dev/null
+++ b/i18nlangtag/inc/i18nlangtag/lang.h
@@ -0,0 +1,568 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_I18NLANGTAG_LANG_H
+#define INCLUDED_I18NLANGTAG_LANG_H
+
+/**
+ These are MS LANGIDs, the lower 10 bits (mask 0x03ff, values below 0x0400
+ aren't real locale IDs) represent the primary language ID, the upper 6 bits
+ represent the sublanguage ID, which in most cases together with the primary
+ language simply designates a country. A LANGID is constructed by
+ UINT16 nLangID = ((((UINT16)(SubLangId)) << 10) | (UINT16)(PriLangId));
+
+ A user-defined primary language ID is a value in the range 0x0200 to 0x03ff.
+ All other values are reserved for Windows system use.
+
+ A user-defined sublanguage identifier is a value in the range 0x20 to 0x3f.
+ All other values are reserved for Windows system use.
+ If there is no sublanguage ID for a primary language ID, use SUBLANG_DEFAULT
+ (0x01, which shifted to the left by 10 bits results in the frequently seen
+ 0x0400). OR'ed with a 0x0200 primary results in 0x0600.
+
+ Values added as of 2006-04-18, a helper script: ../../source/isolang/lcid.awk
+ Utility to compare MS-LANGID definitions with those defined in this file.
+
+ For further information about MS-LANGIDs please see include/winnt.h of a
+ recent MSDEV version and the following web pages.
+
+
+ The once complete list, not necessarily supported by Windows:
+ List of Locale ID (LCID) Values as Assigned by Microsoft
+ http://www.microsoft.com/globaldev/reference/lcid-all.mspx
+
+ As a complete list is never complete, some more that came with WinXP SP2:
+ Windows XP/Server 2003 - List of Locale IDs, Input Locale, and Language Collection
+ http://www.microsoft.com/globaldev/reference/winxp/xp-lcid.mspx
+
+ And of course 2 lists aren't enough, so Windows Vista needs an extra one.
+ Which at least seems to include values of other versions of Windows.
+ Language Identifier Constants and Strings
+ http://msdn2.microsoft.com/en-us/library/ms776294.aspx
+
+ Hey, yet another list, maybe this one will not move around? It seems to be
+ quite complete..
+ Language Identifier Constants and Strings (Windows)
+ http://msdn.microsoft.com/en-us/library/dd318693(VS.85).aspx
+
+ List of supported locale identifiers in Word
+ http://support.microsoft.com/default.aspx?scid=KB;en-us;q221435
+ */
+
+
+/* It must be safe to include this file in plain C code, so only C style
+ * comments are used. Do NOT use // C++ style comments. */
+
+/* disable typedef for usage in svtools/source/misc/langtab.src */
+#ifndef RSC_RESOURCE_USAGE
+typedef unsigned short LanguageType;
+#endif
+
+#define LANGUAGE_MASK_PRIMARY 0x03ff
+
+#ifdef __cplusplus
+/* Please use the methods provided in mslangid.hxx for type-safety! */
+#else
+#define MSLANGID_MAKELANGID( nSubLangId, nPriLangId ) \
+ (((nSubLangId) << 10) | (nPriLangId))
+#define MSLANGID_GETPRIMARYLANGUAGE( nLangID ) \
+ ((nLangID) & LANGUAGE_MASK_PRIMARY)
+#define MSLANGID_GETSUBLANGUAGE( nLangID ) \
+ (((nLangID) & ~LANGUAGE_MASK_PRIMARY) >> 10)
+#endif
+
+
+#define LANGUAGE_DONTKNOW 0x03FF /* yes, the mask */
+#define LANGUAGE_NONE 0x00FF
+#define LANGUAGE_HID_HUMAN_INTERFACE_DEVICE 0x04FF
+#define LANGUAGE_SYSTEM 0x0000 /* OOo/SO definition */
+
+/* The Invariant Locale (Locale ID = 0x007f) is a locale that can be used by
+ * applications when a consistent and locale-independent result is required.
+ * The invariant locale can be used, for example, when comparing character
+ * strings using the CompareString() API and a consistent result regardless of
+ * the User Locale is expected.
+ * The settings of the Invariant Locale are similar to US-English international
+ * standards, but should not be used to display formatted data. */
+/* NOTE: this is taken from the MS documentation! Not supported by OOo/SO! */
+#define LANGUAGE_INVARIANT 0x007F
+
+#define LANGUAGE_AFRIKAANS 0x0436
+#define LANGUAGE_ALBANIAN 0x041C
+#define LANGUAGE_ALSATIAN_FRANCE 0x0484
+#define LANGUAGE_AMHARIC_ETHIOPIA 0x045E
+#define LANGUAGE_ARABIC_ALGERIA 0x1401
+#define LANGUAGE_ARABIC_BAHRAIN 0x3C01
+#define LANGUAGE_ARABIC_EGYPT 0x0C01
+#define LANGUAGE_ARABIC_IRAQ 0x0801
+#define LANGUAGE_ARABIC_JORDAN 0x2C01
+#define LANGUAGE_ARABIC_KUWAIT 0x3401
+#define LANGUAGE_ARABIC_LEBANON 0x3001
+#define LANGUAGE_ARABIC_LIBYA 0x1001
+#define LANGUAGE_ARABIC_MOROCCO 0x1801
+#define LANGUAGE_ARABIC_OMAN 0x2001
+#define LANGUAGE_ARABIC_QATAR 0x4001
+#define LANGUAGE_ARABIC_SAUDI_ARABIA 0x0401
+#define LANGUAGE_ARABIC_SYRIA 0x2801
+#define LANGUAGE_ARABIC_TUNISIA 0x1C01
+#define LANGUAGE_ARABIC_UAE 0x3801
+#define LANGUAGE_ARABIC_YEMEN 0x2401
+#define LANGUAGE_ARABIC_PRIMARY_ONLY 0x0001 /* primary only, not a locale! */
+#define LANGUAGE_ARMENIAN 0x042B
+#define LANGUAGE_ASSAMESE 0x044D
+#define LANGUAGE_AZERI 0x002C /* primary only, not a locale! */
+#define LANGUAGE_AZERI_CYRILLIC 0x082C
+#define LANGUAGE_AZERI_LATIN 0x042C
+#define LANGUAGE_BASHKIR_RUSSIA 0x046D
+#define LANGUAGE_BASQUE 0x042D
+#define LANGUAGE_BELARUSIAN 0x0423
+#define LANGUAGE_BENGALI 0x0445 /* in India */
+#define LANGUAGE_BENGALI_BANGLADESH 0x0845
+#define LANGUAGE_BOSNIAN_LATIN_BOSNIA_HERZEGOVINA 0x141A
+#define LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_HERZEGOVINA 0x201A
+#define LANGUAGE_BOSNIAN_BOSNIA_HERZEGOVINA LANGUAGE_BOSNIAN_LATIN_BOSNIA_HERZEGOVINA /* TODO: remove, only for langtab.src & localize.sdf compatibility */
+#define LANGUAGE_BRETON_FRANCE 0x047E /* obsoletes LANGUAGE_USER_BRETON 0x0629 */
+#define LANGUAGE_BULGARIAN 0x0402
+#define LANGUAGE_BURMESE 0x0455
+#define LANGUAGE_CATALAN 0x0403
+#define LANGUAGE_CHEROKEE_UNITED_STATES 0x045C
+#define LANGUAGE_CHINESE 0x0004 /* primary only, not a locale! */
+#define LANGUAGE_CHINESE_HONGKONG 0x0C04
+#define LANGUAGE_CHINESE_MACAU 0x1404
+#define LANGUAGE_CHINESE_SIMPLIFIED 0x0804
+#define LANGUAGE_CHINESE_SINGAPORE 0x1004
+#define LANGUAGE_CHINESE_TRADITIONAL 0x0404
+/* #define LANGUAGE_CHINESE_SIMPLIFIED 0x0004 */ /* artificial political? Defined as 'zh-CHS' by MS. Primary only! */
+/* #define LANGUAGE_CHINESE_TRADITIONAL 0x7C04 */ /* artificial political? Defined as 'zh-CHT' by MS. */
+#define LANGUAGE_CORSICAN_FRANCE 0x0483
+#define LANGUAGE_CROATIAN 0x041A
+#define LANGUAGE_CROATIAN_BOSNIA_HERZEGOVINA 0x101A
+#define LANGUAGE_CZECH 0x0405
+#define LANGUAGE_DANISH 0x0406
+#define LANGUAGE_DARI_AFGHANISTAN 0x048C /* AKA Zoroastrian Dari */
+#define LANGUAGE_DHIVEHI 0x0465 /* AKA Divehi */
+#define LANGUAGE_DUTCH 0x0413
+#define LANGUAGE_DUTCH_BELGIAN 0x0813
+#define LANGUAGE_EDO 0x0466
+#define LANGUAGE_ENGLISH 0x0009 /* primary only, not a locale! */
+#define LANGUAGE_ENGLISH_AUS 0x0C09
+#define LANGUAGE_ENGLISH_BELIZE 0x2809
+#define LANGUAGE_ENGLISH_CAN 0x1009
+#define LANGUAGE_ENGLISH_CARRIBEAN 0x2409
+#define LANGUAGE_ENGLISH_EIRE 0x1809
+#define LANGUAGE_ENGLISH_HONG_KONG_SAR 0x3C09
+#define LANGUAGE_ENGLISH_INDIA 0x4009
+#define LANGUAGE_ENGLISH_INDONESIA 0x3809
+#define LANGUAGE_ENGLISH_JAMAICA 0x2009
+#define LANGUAGE_ENGLISH_MALAYSIA 0x4409
+#define LANGUAGE_ENGLISH_NZ 0x1409
+#define LANGUAGE_ENGLISH_PHILIPPINES 0x3409
+#define LANGUAGE_ENGLISH_SAFRICA 0x1C09
+#define LANGUAGE_ENGLISH_SINGAPORE 0x4809
+#define LANGUAGE_ENGLISH_TRINIDAD 0x2C09
+#define LANGUAGE_ENGLISH_UK 0x0809
+#define LANGUAGE_ENGLISH_US 0x0409
+#define LANGUAGE_ENGLISH_ZIMBABWE 0x3009
+#define LANGUAGE_ESTONIAN 0x0425
+#define LANGUAGE_FAEROESE 0x0438
+#define LANGUAGE_FARSI 0x0429
+#define LANGUAGE_FILIPINO 0x0464
+#define LANGUAGE_FINNISH 0x040B
+#define LANGUAGE_FRENCH 0x040C
+#define LANGUAGE_FRENCH_BELGIAN 0x080C
+#define LANGUAGE_FRENCH_CAMEROON 0x2C0C
+#define LANGUAGE_FRENCH_CANADIAN 0x0C0C
+#define LANGUAGE_FRENCH_COTE_D_IVOIRE 0x300C
+
+#define LANGUAGE_FRENCH_HAITI 0x3C0C
+#define LANGUAGE_FRENCH_LUXEMBOURG 0x140C
+#define LANGUAGE_FRENCH_MALI 0x340C
+#define LANGUAGE_FRENCH_MONACO 0x180C
+#define LANGUAGE_FRENCH_MOROCCO 0x380C
+#define LANGUAGE_FRENCH_NORTH_AFRICA 0xE40C
+#define LANGUAGE_FRENCH_REUNION 0x200C
+#define LANGUAGE_FRENCH_SENEGAL 0x280C
+#define LANGUAGE_FRENCH_SWISS 0x100C
+#define LANGUAGE_FRENCH_WEST_INDIES 0x1C0C
+#define LANGUAGE_FRENCH_ZAIRE 0x240C
+#define LANGUAGE_FRISIAN_NETHERLANDS 0x0462
+#define LANGUAGE_FULFULDE_NIGERIA 0x0467
+#define LANGUAGE_GAELIC_IRELAND 0x083C
+#define LANGUAGE_GAELIC_SCOTLAND 0x043C
+#define LANGUAGE_GALICIAN 0x0456
+#define LANGUAGE_GEORGIAN 0x0437
+#define LANGUAGE_GERMAN 0x0407
+#define LANGUAGE_GERMAN_AUSTRIAN 0x0C07
+#define LANGUAGE_GERMAN_LIECHTENSTEIN 0x1407
+#define LANGUAGE_GERMAN_LUXEMBOURG 0x1007
+#define LANGUAGE_GERMAN_SWISS 0x0807
+#define LANGUAGE_GREEK 0x0408
+#define LANGUAGE_GUARANI_PARAGUAY 0x0474
+#define LANGUAGE_GUJARATI 0x0447
+#define LANGUAGE_HAUSA_NIGERIA 0x0468
+#define LANGUAGE_HAWAIIAN_UNITED_STATES 0x0475
+#define LANGUAGE_HEBREW 0x040D
+#define LANGUAGE_HINDI 0x0439
+#define LANGUAGE_HUNGARIAN 0x040E
+#define LANGUAGE_IBIBIO_NIGERIA 0x0469
+#define LANGUAGE_ICELANDIC 0x040F
+#define LANGUAGE_IGBO_NIGERIA 0x0470
+#define LANGUAGE_INDONESIAN 0x0421
+#define LANGUAGE_INUKTITUT_SYLLABICS_CANADA 0x045D
+#define LANGUAGE_INUKTITUT_LATIN_CANADA 0x085D
+#define LANGUAGE_ITALIAN 0x0410
+#define LANGUAGE_ITALIAN_SWISS 0x0810
+#define LANGUAGE_JAPANESE 0x0411
+#define LANGUAGE_KALAALLISUT_GREENLAND 0x046F /* obsoletes LANGUAGE_USER_KALAALLISUT 0x062A */
+#define LANGUAGE_KANNADA 0x044B
+#define LANGUAGE_KANURI_NIGERIA 0x0471
+#define LANGUAGE_KASHMIRI 0x0460
+#define LANGUAGE_KASHMIRI_INDIA 0x0860
+#define LANGUAGE_KAZAKH 0x043F
+#define LANGUAGE_KHMER 0x0453
+#define LANGUAGE_KICHE_GUATEMALA 0x0486 /* AKA K'iche', West Central Quiche, */
+#define LANGUAGE_KINYARWANDA_RWANDA 0x0487 /* obsoletes LANGUAGE_USER_KINYARWANDA 0x0621 */
+#define LANGUAGE_KIRGHIZ 0x0440 /* AKA Kyrgyz */
+#define LANGUAGE_KONKANI 0x0457
+#define LANGUAGE_KOREAN 0x0412
+#define LANGUAGE_KOREAN_JOHAB 0x0812
+#define LANGUAGE_LAO 0x0454
+#define LANGUAGE_LATIN 0x0476 /* obsoletes LANGUAGE_USER_LATIN 0x0610 */
+#define LANGUAGE_LATVIAN 0x0426
+#define LANGUAGE_LITHUANIAN 0x0427
+#define LANGUAGE_LITHUANIAN_CLASSIC 0x0827
+#define LANGUAGE_LUXEMBOURGISH_LUXEMBOURG 0x046E /* obsoletes LANGUAGE_USER_LUXEMBOURGISH 0x0630 */
+#define LANGUAGE_MACEDONIAN 0x042F
+#define LANGUAGE_MALAY 0x003E /* primary only, not a locale! */
+#define LANGUAGE_MALAYALAM 0x044C /* in India */
+#define LANGUAGE_MALAY_BRUNEI_DARUSSALAM 0x083E
+#define LANGUAGE_MALAY_MALAYSIA 0x043E
+#define LANGUAGE_MALTESE 0x043A
+#define LANGUAGE_MANIPURI 0x0458
+#define LANGUAGE_MAORI_NEW_ZEALAND 0x0481 /* obsoletes LANGUAGE_USER_MAORI 0x0620 */
+#define LANGUAGE_MAPUDUNGUN_CHILE 0x047A /* AKA Araucanian */
+#define LANGUAGE_MARATHI 0x044E
+#define LANGUAGE_MOHAWK_CANADA 0x047C
+#define LANGUAGE_MONGOLIAN 0x0450 /* Cyrillic script */
+#define LANGUAGE_MONGOLIAN_MONGOLIAN 0x0850
+#define LANGUAGE_NEPALI 0x0461
+#define LANGUAGE_NEPALI_INDIA 0x0861
+#define LANGUAGE_NORWEGIAN 0x0014 /* primary only, not a locale! */
+#define LANGUAGE_NORWEGIAN_BOKMAL 0x0414
+#define LANGUAGE_NORWEGIAN_NYNORSK 0x0814
+#define LANGUAGE_OCCITAN_FRANCE 0x0482 /* obsoletes LANGUAGE_USER_OCCITAN 0x0625 */
+#define LANGUAGE_ORIYA 0x0448
+#define LANGUAGE_OROMO 0x0472
+#define LANGUAGE_PAPIAMENTU 0x0479
+#define LANGUAGE_PASHTO 0x0463
+#define LANGUAGE_POLISH 0x0415
+#define LANGUAGE_PORTUGUESE 0x0816
+#define LANGUAGE_PORTUGUESE_BRAZILIAN 0x0416
+#define LANGUAGE_PUNJABI 0x0446
+#define LANGUAGE_PUNJABI_PAKISTAN 0x0846
+#define LANGUAGE_QUECHUA_BOLIVIA 0x046B
+#define LANGUAGE_QUECHUA_ECUADOR 0x086B
+#define LANGUAGE_QUECHUA_PERU 0x0C6B
+#define LANGUAGE_RHAETO_ROMAN 0x0417
+#define LANGUAGE_ROMANIAN 0x0418
+#define LANGUAGE_ROMANIAN_MOLDOVA 0x0818
+#define LANGUAGE_RUSSIAN 0x0419
+#define LANGUAGE_RUSSIAN_MOLDOVA 0x0819
+#define LANGUAGE_SAMI_NORTHERN_NORWAY 0x043B
+#define LANGUAGE_SAMI_LAPPISH LANGUAGE_SAMI_NORTHERN_NORWAY /* the old MS definition */
+#define LANGUAGE_SAMI_INARI 0x243B
+#define LANGUAGE_SAMI_LULE_NORWAY 0x103B
+#define LANGUAGE_SAMI_LULE_SWEDEN 0x143B
+#define LANGUAGE_SAMI_NORTHERN_FINLAND 0x0C3B
+#define LANGUAGE_SAMI_NORTHERN_SWEDEN 0x083B
+#define LANGUAGE_SAMI_SKOLT 0x203B
+#define LANGUAGE_SAMI_SOUTHERN_NORWAY 0x183B
+#define LANGUAGE_SAMI_SOUTHERN_SWEDEN 0x1C3B
+#define LANGUAGE_SANSKRIT 0x044F
+#define LANGUAGE_SEPEDI 0x046C
+#define LANGUAGE_NORTHERNSOTHO LANGUAGE_SEPEDI /* just an alias for the already existing localization */
+#define LANGUAGE_SERBIAN 0x001A /* primary only, not a locale! */
+#define LANGUAGE_SERBIAN_CYRILLIC 0x0C1A /* MS lists this as Serbian (Cyrillic, Serbia) 'sr-Cyrl-SP', but they use 'SP' since at least Windows2003 where it was Serbia and Montenegro! */
+#define LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA 0x1C1A
+#define LANGUAGE_SERBIAN_LATIN 0x081A /* MS lists this as Serbian (Latin, Serbia) 'sr-Latn-SP', but they use 'SP' since at least Windows2003 where it was Serbia and Montenegro! */
+#define LANGUAGE_SERBIAN_LATIN_BOSNIA_HERZEGOVINA 0x181A
+#define LANGUAGE_SERBIAN_LATIN_NEUTRAL 0x7C1A /* MS lists this as 'sr' only. What a mess. */
+#define LANGUAGE_SESOTHO 0x0430 /* also called Sutu now by MS */
+#define LANGUAGE_SINDHI 0x0459
+#define LANGUAGE_SINDHI_PAKISTAN 0x0859
+#define LANGUAGE_SINHALESE_SRI_LANKA 0x045B
+#define LANGUAGE_SLOVAK 0x041B
+#define LANGUAGE_SLOVENIAN 0x0424
+#define LANGUAGE_SOMALI 0x0477
+#define LANGUAGE_UPPER_SORBIAN_GERMANY 0x042E /* obsoletes LANGUAGE_USER_UPPER_SORBIAN 0x0623 */
+#define LANGUAGE_LOWER_SORBIAN_GERMANY 0x082E /* obsoletes LANGUAGE_USER_LOWER_SORBIAN 0x0624. NOTE: the primary ID is identical to Upper Sorbian, which is not quite correct because they're distinct languages */
+#define LANGUAGE_SORBIAN LANGUAGE_USER_UPPER_SORBIAN /* a strange MS definition */
+#define LANGUAGE_SPANISH_DATED 0x040A /* old collation, not supported, see #i94435# */
+#define LANGUAGE_SPANISH_ARGENTINA 0x2C0A
+#define LANGUAGE_SPANISH_BOLIVIA 0x400A
+#define LANGUAGE_SPANISH_CHILE 0x340A
+#define LANGUAGE_SPANISH_COLOMBIA 0x240A
+#define LANGUAGE_SPANISH_COSTARICA 0x140A
+#define LANGUAGE_SPANISH_DOMINICAN_REPUBLIC 0x1C0A
+#define LANGUAGE_SPANISH_ECUADOR 0x300A
+#define LANGUAGE_SPANISH_EL_SALVADOR 0x440A
+#define LANGUAGE_SPANISH_GUATEMALA 0x100A
+#define LANGUAGE_SPANISH_HONDURAS 0x480A
+#define LANGUAGE_SPANISH_LATIN_AMERICA 0xE40A /* no locale possible */
+#define LANGUAGE_SPANISH_MEXICAN 0x080A
+#define LANGUAGE_SPANISH_MODERN 0x0C0A
+#define LANGUAGE_SPANISH_NICARAGUA 0x4C0A
+#define LANGUAGE_SPANISH_PANAMA 0x180A
+#define LANGUAGE_SPANISH_PARAGUAY 0x3C0A
+#define LANGUAGE_SPANISH_PERU 0x280A
+#define LANGUAGE_SPANISH_PUERTO_RICO 0x500A
+#define LANGUAGE_SPANISH_UNITED_STATES 0x540A
+#define LANGUAGE_SPANISH_URUGUAY 0x380A
+#define LANGUAGE_SPANISH_VENEZUELA 0x200A
+#define LANGUAGE_SPANISH LANGUAGE_SPANISH_MODERN /* modern collation, see #i94435# */
+#define LANGUAGE_SWAHILI 0x0441 /* Kenya */
+#define LANGUAGE_SWEDISH 0x041D
+#define LANGUAGE_SWEDISH_FINLAND 0x081D
+#define LANGUAGE_SYRIAC 0x045A
+#define LANGUAGE_TAJIK 0x0428
+#define LANGUAGE_TAMAZIGHT_ARABIC 0x045F
+#define LANGUAGE_TAMAZIGHT_LATIN 0x085F
+#define LANGUAGE_TAMAZIGHT_TIFINAGH 0x0C5F
+#define LANGUAGE_TAMIL 0x0449
+#define LANGUAGE_TATAR 0x0444
+#define LANGUAGE_TELUGU 0x044A
+#define LANGUAGE_THAI 0x041E
+#define LANGUAGE_TIBETAN 0x0451
+#define LANGUAGE_DZONGKHA 0x0851
+#define LANGUAGE_TIBETAN_BHUTAN LANGUAGE_DZONGKHA /* a MS error, see #i53497# */
+#define LANGUAGE_TIGRIGNA_ERITREA 0x0873
+#define LANGUAGE_TIGRIGNA_ETHIOPIA 0x0473
+#define LANGUAGE_TSONGA 0x0431
+#define LANGUAGE_TSWANA 0x0432 /* AKA Setsuana, for South Africa */
+#define LANGUAGE_TURKISH 0x041F
+#define LANGUAGE_TURKMEN 0x0442
+#define LANGUAGE_UIGHUR_CHINA 0x0480
+#define LANGUAGE_UKRAINIAN 0x0422
+#define LANGUAGE_URDU 0x0020 /* primary only, not a locale! */
+#define LANGUAGE_URDU_INDIA 0x0820
+#define LANGUAGE_URDU_PAKISTAN 0x0420
+#define LANGUAGE_UZBEK_CYRILLIC 0x0843
+#define LANGUAGE_UZBEK_LATIN 0x0443
+#define LANGUAGE_VENDA 0x0433
+#define LANGUAGE_VIETNAMESE 0x042A
+#define LANGUAGE_WELSH 0x0452
+#define LANGUAGE_WOLOF_SENEGAL 0x0488
+#define LANGUAGE_XHOSA 0x0434 /* AKA isiZhosa */
+#define LANGUAGE_YAKUT_RUSSIA 0x0485
+#define LANGUAGE_YI 0x0478 /* Sichuan Yi */
+#define LANGUAGE_YIDDISH 0x043D
+#define LANGUAGE_YORUBA 0x046A
+#define LANGUAGE_ZULU 0x0435
+
+/*! use only for import/export of MS documents, number formatter maps it to
+ *! LANGUAGE_SYSTEM and then to effective system language */
+#define LANGUAGE_SYSTEM_DEFAULT 0x0800
+
+/*! use only for import/export of MS documents, number formatter maps it to
+ *! LANGUAGE_SYSTEM and then to effective system language */
+#define LANGUAGE_PROCESS_OR_USER_DEFAULT 0x0400
+
+/* And now the extensions we define, valid from
+ * 0x0610 to 0x07FF with sublanguage ID 0x01 (default)
+ * 0x0A00 to 0x0BFF with sublanguage ID 0x02
+ * ...
+ * 0x8200 to 0x83FF with sublanguage ID 0x20
+ * 0x8600 to 0x87FF with sublanguage ID 0x21
+ * ...
+ * 0xFA00 to 0xFBFF with sublanguage ID 0x3E
+ * 0xFE00 to 0xFFFF with sublanguage ID 0x3F
+ *
+ * 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 i18nlangtag/source/isolang/isolang.cxx, but
+ * mapping ISO back to LANGID will return the new value.
+ */
+#define LANGUAGE_OBSOLETE_USER_LATIN 0x0610
+#define LANGUAGE_USER_LATIN LANGUAGE_LATIN
+#define LANGUAGE_USER_ESPERANTO 0x0611 /* no locale possible */
+#define LANGUAGE_USER_INTERLINGUA 0x0612 /* no locale, but conventions */
+#define LANGUAGE_OBSOLETE_USER_MAORI 0x0620
+#define LANGUAGE_USER_MAORI LANGUAGE_MAORI_NEW_ZEALAND
+#define LANGUAGE_OBSOLETE_USER_KINYARWANDA 0x0621
+#define LANGUAGE_USER_KINYARWANDA LANGUAGE_KINYARWANDA_RWANDA
+/* was reserved for Northern Sotho but never used: 0x0622 */ /* obsoleted by LANGUAGE_SEPEDI */
+#define LANGUAGE_OBSOLETE_USER_UPPER_SORBIAN 0x0623
+#define LANGUAGE_USER_UPPER_SORBIAN LANGUAGE_UPPER_SORBIAN_GERMANY
+#define LANGUAGE_OBSOLETE_USER_LOWER_SORBIAN 0x0624
+#define LANGUAGE_USER_LOWER_SORBIAN LANGUAGE_LOWER_SORBIAN_GERMANY
+#define LANGUAGE_OBSOLETE_USER_OCCITAN 0x0625
+#define LANGUAGE_USER_OCCITAN LANGUAGE_OCCITAN_FRANCE /* reserved to languedocian */
+
+#define LANGUAGE_USER_KOREAN_NORTH 0x8012 /* North Korean as opposed to South Korean, makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_KOREAN)) */
+#define LANGUAGE_USER_KURDISH_TURKEY 0x0626 /* sublang 0x01, Latin script */
+#define LANGUAGE_USER_KURDISH_SYRIA 0x0A26 /* sublang 0x02, Latin script */
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list