From 876c619b944dfbc88464045f1400c549a01a1164 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Fri, 5 Apr 2013 18:40:39 +0200
Subject: 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
---
 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 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'cui')

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index c5e8609cbec5..7a0bfaec7dbd 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 0be71ef9c33d..54a5c1ac78fe 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 6e04e19076ea..56b0185a4b8d 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 50bfe4da92a5..66984ca99375 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 d9f214684eff..d495a243231d 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 d2e3a11dbb5d..934f0c841b20 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 d7e68f85a029..8d5bbb198cc9 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 67dce8106e7e..f208845d5e46 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 f7c8aab03be7..f0a6e2d24d8d 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>
-- 
cgit