summaryrefslogtreecommitdiff
path: root/svx
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 /svx
parent8ef9e38aa84675c57b331a796d900b3c10e04f44 (diff)
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 'svx')
-rw-r--r--svx/Library_svx.mk2
-rw-r--r--svx/Library_svxcore.mk2
-rw-r--r--svx/Library_textconversiondlgs.mk2
-rw-r--r--svx/inc/pch/precompiled_svx.hxx2
-rw-r--r--svx/inc/pch/precompiled_svxcore.hxx4
-rw-r--r--svx/inc/svx/numfmtsh.hxx2
-rw-r--r--svx/source/dialog/langbox.cxx4
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/form/fmcontrollayout.cxx4
-rw-r--r--svx/source/items/numfmtsh.cxx2
-rw-r--r--svx/source/svdraw/svdetc.cxx2
12 files changed, 15 insertions, 15 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 169c01c3ca88..9ebfd965da0f 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,svx,\
cppu \
drawinglayer \
editeng \
- i18nisolang1 \
+ i18nlangtag \
sal \
sfx \
sot \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index fb560b722179..c868a5874c01 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -60,7 +60,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
drawinglayer \
editeng \
fwe \
- i18nisolang1 \
+ i18nlangtag \
lng \
sal \
salhelper \
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index 50db32b3af33..ead619daf964 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\
cppuhelper \
cppu \
sal \
- i18nisolang1 \
+ i18nlangtag \
svl \
svt \
tk \
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 5033dc069eae..31ee52c31963 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -259,7 +259,7 @@
#include <editeng/unotext.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/wrlmitem.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
#include <limits.h>
#include <limits>
#include <list>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 84c5f29f16b7..fb69e88f5a62 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -429,8 +429,8 @@
#include <editeng/wrlmitem.hxx>
#include <float.h>
#include <framework/interaction.hxx>
-#include <i18npool/lang.h>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/lang.h>
+#include <i18nlangtag/mslangid.hxx>
#include <limits>
#include <linguistic/misc.hxx>
#include <map>
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index efc47fb8de6e..6f767c70c372 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -20,7 +20,7 @@
#define _SVX_NUMFMTSH_HXX
#include <tools/string.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
#include "svx/svxdllapi.h"
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 5dca172caa90..7291b1728cbd 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -25,8 +25,8 @@
#include <tools/urlobj.hxx>
#include <svtools/langtab.hxx>
#include <tools/shl.hxx>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/lang.h>
#include <editeng/scripttypeitem.hxx>
#include <editeng/unolingu.hxx>
#include <svx/langbox.hxx>
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index cc160a744067..cfddf3fab190 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -20,7 +20,7 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include <tools/shl.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
#include <svtools/valueset.hxx>
#include <svl/languageoptions.hxx>
#include <helpid.hrc>
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 053eac32d569..1022fbfebc3c 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -51,7 +51,7 @@
#include <comphelper/string.hxx>
#include <connectivity/formattedcolumnvalue.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
#include <rtl/math.hxx>
#include <svtools/calendar.hxx>
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 179023218786..a630f5b580b7 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -31,8 +31,8 @@
#include <com/sun/star/container/XChild.hpp>
#include <comphelper/processfactory.hxx>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <unotools/syslocale.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 1187f9785d56..d33ca4ca0564 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -21,7 +21,7 @@
#define _SVX_NUMFMTSH_CXX
#include <tools/debug.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 6dccf8a26312..54f89dc246b5 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -49,7 +49,7 @@
#include <svl/itempool.hxx>
#include <unotools/localedatawrapper.hxx>
#include <com/sun/star/lang/Locale.hpp>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
#include <unotools/syslocale.hxx>
#include <svx/xflbckit.hxx>
#include <svx/extrusionbar.hxx>