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
---
 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 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'xmloff')

diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk b/xmloff/CppunitTest_xmloff_uxmloff.mk
index 37959ad17966..4a5492c7e074 100644
--- a/xmloff/CppunitTest_xmloff_uxmloff.mk
+++ b/xmloff/CppunitTest_xmloff_uxmloff.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,xmloff_uxmloff, \
     comphelper \
     cppu \
     cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
     sal \
     salhelper \
 	sax \
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index e3777e482265..8994ff3d76d2 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,xo,\
     comphelper \
     cppu \
     cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
     sal \
     salhelper \
 	sax \
diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx
index 2511a9704e41..66605f503df2 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -498,8 +498,8 @@
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <functional>
-#include <i18npool/languagetag.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <iterator>
 #include <limits.h>
 #include <list>
diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx
index 678d9f26ae29..71a6a82af454 100644
--- a/xmloff/inc/xmloff/xmlnumfi.hxx
+++ b/xmloff/inc/xmloff/xmlnumfi.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/xmlstyle.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <vector>
 #include <unotools/localedatawrapper.hxx>
 
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index 0da8be653b9b..6bba79c777d6 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <tools/debug.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <xmloff/xmlmetae.hxx>
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 362b5d94256b..c34a0e679794 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -21,8 +21,8 @@
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <svl/numuno.hxx>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
 #include <unotools/calendarwrapper.hxx>
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 3e2c5455a160..d2c589657085 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -26,7 +26,7 @@
 #include <svl/zformat.hxx>
 #include <svl/numuno.hxx>
 #include <rtl/math.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
-- 
cgit