summaryrefslogtreecommitdiffstats
path: root/svtools
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-04-05 18:40:39 +0200
committerEike Rathke <erack@redhat.com>2013-04-05 19:10:48 +0200
commit876c619b944dfbc88464045f1400c549a01a1164 (patch)
treef15f930fe100bda4c0a0503728654801ac977fcd /svtools
parentuse LanguageTag (diff)
downloadcore-876c619b944dfbc88464045f1400c549a01a1164.tar.gz
core-876c619b944dfbc88464045f1400c549a01a1164.zip
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
Diffstat (limited to 'svtools')
-rw-r--r--svtools/AllLangResTarget_svt.mk2
-rw-r--r--svtools/Executable_langsupport.mk2
-rw-r--r--svtools/Library_svt.mk2
-rw-r--r--svtools/inc/pch/precompiled_svt.hxx6
-rw-r--r--svtools/inc/svtools/langtab.hxx2
-rw-r--r--svtools/inc/svtools/sampletext.hxx2
-rw-r--r--svtools/langsupport/langsupport.cxx2
-rw-r--r--svtools/source/control/ctrltool.cxx2
-rw-r--r--svtools/source/control/fmtfield.cxx2
-rw-r--r--svtools/source/misc/langtab.cxx6
-rw-r--r--svtools/source/misc/langtab.src2
11 files changed, 15 insertions, 15 deletions
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 96cd1b450e82..c9e33f94dbcc 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,svt,\
$(eval $(call gb_SrsTarget_SrsTarget,svt/res))
$(eval $(call gb_SrsTarget_use_packages,svt/res,\
- i18npool_inc \
+ i18nlangtag_inc \
svl_inc \
svtools_inc \
vcl_inc \
diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk
index 512c8a18d30b..12c60f231f63 100644
--- a/svtools/Executable_langsupport.mk
+++ b/svtools/Executable_langsupport.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\
comphelper \
cppu \
cppuhelper \
- i18nisolang1 \
+ i18nlangtag \
sal \
svt \
tl \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 4f6adaeb2f7f..52f07a4f116f 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,svt,\
comphelper \
cppu \
cppuhelper \
- i18nisolang1 \
+ i18nlangtag \
i18nutil \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmfwk) \
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 6f4dcdc1381e..615967968cb9 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -298,9 +298,9 @@
#include <cstdio>
#include <ctype.h>
#include <functional>
-#include <i18npool/lang.h>
-#include <i18npool/languagetag.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/lang.h>
+#include <i18nlangtag/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
#include <i18nutil/unicode.hxx>
#include <jvmfwk/framework.h>
#include <limits.h>
diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx
index aab0b3b17752..aeed99454006 100644
--- a/svtools/inc/svtools/langtab.hxx
+++ b/svtools/inc/svtools/langtab.hxx
@@ -21,7 +21,7 @@
#include <tools/resary.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
#include <svtools/svtdllapi.h>
//========================================================================
diff --git a/svtools/inc/svtools/sampletext.hxx b/svtools/inc/svtools/sampletext.hxx
index f7903d85ed67..5911eb7530f3 100644
--- a/svtools/inc/svtools/sampletext.hxx
+++ b/svtools/inc/svtools/sampletext.hxx
@@ -31,7 +31,7 @@
#include "svtools/svtdllapi.h"
#include <rtl/ustring.hxx>
#include <unicode/uscript.h>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <vcl/fontcapabilities.hxx>
diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx
index efcc5f550ee2..41ef0242c337 100644
--- a/svtools/langsupport/langsupport.cxx
+++ b/svtools/langsupport/langsupport.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/bootstrap.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <sal/main.h>
#include <svtools/langtab.hxx>
#include <tools/extendapplicationenvironment.hxx>
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 4c501704f2b5..fe1201c6495a 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -24,7 +24,7 @@
#include <comphelper/string.hxx>
#include <tools/debug.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 697075e93a2b..f3931bbad7ea 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -26,7 +26,7 @@
#include <vcl/svapp.hxx>
#include <svl/zformat.hxx>
#include <svtools/fmtfield.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/util/SearchOptions.hpp>
#include <com/sun/star/util/SearchAlgorithms.hpp>
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 910cbe926c60..584a205ed9a7 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -23,9 +23,9 @@
#include <com/sun/star/i18n/DirectionProperty.hpp>
-#include <i18npool/lang.h>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/lang.h>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <svtools/svtools.hrc>
#include <svtools/svtresid.hxx>
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index cafddd7d870f..48f670cf0ae2 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -20,7 +20,7 @@
#include <svtools/svtools.hrc>
#define RSC_RESOURCE_USAGE 1
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
#define PairedList ItemList