diff options
Diffstat (limited to 'vcl')
36 files changed, 42 insertions, 42 deletions
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index bce3d93a02b9..ce3ab0472b71 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ $(if $(filter TRUE,$(SOLAR_JAVA)), \ jvmaccess) \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index c5ad854d83c4..0abe61e9c015 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -76,7 +76,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ cppu \ sal \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index edf16e0f92d1..5bef1439ffa3 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 3b8a6d21814b..6607d1057cb1 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 7f29e762b8d4..cd9b63a0994a 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ basebmp \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 249fcb3e01c1..5e9c666a2943 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index ff4b89c275fd..93f68587282a 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index c35bddaf0473..7d40e5eb467f 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ basebmp \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index c4dd88d15bb3..f2c992b5adab 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ basegfx \ comphelper \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index f86c81419de3..acac73a6b596 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -34,7 +34,7 @@ $(eval $(call gb_StaticLibrary_use_packages,headless,\ comphelper_inc \ cppu_odk_headers \ cppuhelper_odk_headers \ - i18npool_inc \ + i18nlangtag_inc \ i18nutil_inc \ o3tl_inc \ rsc_inc \ diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index f5dda96627d7..33aff6a36d3c 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -26,7 +26,7 @@ #include <vcl/vclenum.hxx> #include <vcl/wrkwin.hxx> #include "outfont.hxx" -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <i18nutil/unicode.hxx> #include <rtl/strbuf.hxx> #include <unicode/uchar.h> diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index de66c528e493..8a1a5e1ea6b5 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -48,7 +48,7 @@ #include <sal/macros.h> -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" #include "parseAFM.hxx" diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index ab482b4b49dc..ddf6d7cfc22f 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -23,7 +23,7 @@ #include <boost/static_assert.hpp> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index 903b1457f7d3..2e3739c063b3 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -21,7 +21,7 @@ // // Platform -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <sallayout.hxx> // Module #include "gcach_ftyp.hxx" diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index eb6a52929a29..98601f034410 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -53,7 +53,7 @@ #endif #include <comphelper/string.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> using namespace psp; diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index cad00e3d8f3d..0d91254b0612 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -22,7 +22,7 @@ #include <tools/gen.hxx> #include <tools/string.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/color.hxx> #include <vcl/dllapi.h> #include <vcl/vclenum.hxx> diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index e3a516f2062d..9d5066ba5af5 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> #include <tools/string.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/solar.h> #include <vcl/dllapi.h> #include <unotools/fontdefs.hxx> diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index c75e6c82ba4d..e259a58f1908 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -84,8 +84,8 @@ #include "cppuhelper/compbase1.hxx" #include "cppuhelper/compbase2.hxx" #include "cppuhelper/implbase1.hxx" -#include "i18npool/languagetag.hxx" -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/languagetag.hxx" +#include "i18nlangtag/mslangid.hxx" #include "i18nutil/unicode.hxx" #include "osl/diagnose.h" #include "osl/file.h" @@ -285,9 +285,9 @@ #include <ctype.h> #include <fcntl.h> #include <functional> -#include <i18npool/lang.h> -#include <i18npool/languagetag.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/lang.h> +#include <i18nlangtag/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> #include <i18nutil/unicode.hxx> #include <iostream> #include <jerror.h> diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index c9a7e19452e4..62b982f8f5b6 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -20,7 +20,7 @@ #ifndef _SV_SALWTYPE_HXX #define _SV_SALWTYPE_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/string.hxx> #include <tools/solar.h> diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx index 7cc45eff8e38..3a49368fc84f 100644 --- a/vcl/inc/unx/i18n_ic.hxx +++ b/vcl/inc/unx/i18n_ic.hxx @@ -20,7 +20,7 @@ #ifndef _SAL_I18N_INPUTCONTEXT_HXX #define _SAL_I18N_INPUTCONTEXT_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include "i18n_cb.hxx" class SalI18N_InputContext diff --git a/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx index f651ba6c1401..98226249843a 100644 --- a/vcl/inc/vcl/font.hxx +++ b/vcl/inc/vcl/font.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <vcl/dllapi.h> #include <tools/string.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/color.hxx> #include <vcl/vclenum.hxx> #include <vcl/fntstyle.hxx> diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx index 98351ea630cc..ae9a2d092627 100644 --- a/vcl/inc/vcl/i18nhelp.hxx +++ b/vcl/inc/vcl/i18nhelp.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/uno/Reference.h> #include <osl/mutex.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/string.hxx> #include <vcl/dllapi.h> diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index 02e062b31514..4db5e293a5e5 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -148,7 +148,7 @@ public: // case the arbitrary id has to be passed again when the // actual link annotation is created via SetLinkPropertyID LinkAnnotation, - // Language currently sets a LanguageType (see i18npool/lang.h) + // Language currently sets a LanguageType (see i18nlangtag/lang.h) // which will be internally changed to a corresponding locale Language }; diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index b0ef1d5ee0d5..ebb42c365c4d 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -27,7 +27,7 @@ #include "vcl/font.hxx" #include "vcl/accel.hxx" #include "vcl/wall.hxx" -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/syslocale.hxx> class CollatorWrapper; diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index bdec4bb2d3c4..1ed6efceaa48 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -22,7 +22,7 @@ #include "unotools/localedatawrapper.hxx" #include "unotools/transliterationwrapper.hxx" -#include "i18npool/languagetag.hxx" +#include "i18nlangtag/languagetag.hxx" #include "rtl/ustrbuf.hxx" diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index a45f5894c289..adbadbe2ffb4 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -25,8 +25,8 @@ #include "tools/debug.hxx" #include <vcl/graphicfilter.hxx> -#include "i18npool/mslangid.hxx" -#include "i18npool/languagetag.hxx" +#include "i18nlangtag/mslangid.hxx" +#include "i18nlangtag/languagetag.hxx" #include "vcl/svapp.hxx" #include "vcl/event.hxx" diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index d7f3081ab48c..1692170517f0 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -31,7 +31,7 @@ #include "tools/debug.hxx" #include "tools/time.hxx" -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" #include "unotools/syslocaleoptions.hxx" diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 8b9972d09aeb..785358017e41 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -29,7 +29,7 @@ #include <svdata.hxx> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/XCharacterClassification.hpp> diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 0413cc0ceb9b..cfe02e9ea513 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "i18npool/mslangid.hxx" -#include "i18npool/languagetag.hxx" +#include "i18nlangtag/mslangid.hxx" +#include "i18nlangtag/languagetag.hxx" #include "rtl/tencinfo.h" #include "rtl/logfile.hxx" diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 1307193868e0..c7cf75b32adf 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -44,7 +44,7 @@ #include <tools/zcodec.hxx> #include <tools/stream.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <vcl/virdev.hxx> #include <vcl/bmpacc.hxx> diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 10cde2e4636d..ebf348cb0e4b 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -30,7 +30,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <tools/debug.hxx> diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 877e1dd9d2d3..83c6f63c6177 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -25,7 +25,7 @@ #include <vcl/unohelp.hxx> #include <com/sun/star/i18n/XCharacterClassification.hpp> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> using namespace ::com::sun::star; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 8c9c30f5cf9a..629a1cf8bc5d 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -19,7 +19,7 @@ #include <config_features.h> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include "tools/time.hxx" #include "tools/debug.hxx" diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 96ce72da2bdf..8cec77e5bda5 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -42,7 +42,7 @@ #include "basegfx/polygon/b2dpolypolygon.hxx" -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" #include <boost/unordered_set.hpp> diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index afbe04e967b4..3d7a40017689 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -25,7 +25,7 @@ #include "rtl/logfile.hxx" #include "rtl/bootstrap.hxx" -#include "i18npool/mslangid.hxx" +#include "i18nlangtag/mslangid.hxx" #include "osl/file.hxx" #include "osl/process.h" diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 83bb2c3f5980..bc3f8021743c 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -52,7 +52,7 @@ typedef boost::unordered_map<int,int> IntMap; // Graphite headers #include <config_graphite.h> #if ENABLE_GRAPHITE -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <graphite_layout.hxx> #include <graphite_features.hxx> #endif |