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
---
 editeng/CppunitTest_editeng_borderline.mk | 2 +-
 editeng/CppunitTest_editeng_core.mk       | 2 +-
 editeng/CppunitTest_editeng_lookuptree.mk | 2 +-
 editeng/Library_editeng.mk                | 2 +-
 editeng/inc/editeng/SpellPortions.hxx     | 2 +-
 editeng/inc/editeng/editeng.hxx           | 2 +-
 editeng/inc/editeng/editstat.hxx          | 2 +-
 editeng/inc/editeng/editview.hxx          | 2 +-
 editeng/inc/editeng/edtdlg.hxx            | 2 +-
 editeng/inc/editeng/flditem.hxx           | 2 +-
 editeng/inc/editeng/hangulhanja.hxx       | 2 +-
 editeng/inc/editeng/langitem.hxx          | 2 +-
 editeng/inc/editeng/outliner.hxx          | 2 +-
 editeng/inc/editeng/svxacorr.hxx          | 2 +-
 editeng/inc/editeng/svxfont.hxx           | 2 +-
 editeng/inc/editeng/unoedsrc.hxx          | 2 +-
 editeng/inc/editeng/unolingu.hxx          | 2 +-
 editeng/source/editeng/editeng.cxx        | 2 +-
 editeng/source/editeng/editview.cxx       | 4 ++--
 editeng/source/editeng/impedit.hxx        | 2 +-
 editeng/source/editeng/impedit3.cxx       | 2 +-
 editeng/source/editeng/impedit4.cxx       | 2 +-
 editeng/source/items/textitem.cxx         | 2 +-
 editeng/source/misc/svxacorr.cxx          | 2 +-
 editeng/source/misc/unolingu.cxx          | 2 +-
 editeng/source/outliner/outlvw.cxx        | 2 +-
 26 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'editeng')

diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index c8547109b6fe..354b9cfad092 100644
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \
     cppu \
     sal \
     salhelper \
-    i18nisolang1 \
+    i18nlangtag \
     i18nutil \
 	$(gb_UWINAPI) \
 ))
diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk
index d8ede2ea322d..fb43b8ecae64 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \
     comphelper \
     cppu \
     cppuhelper \
-    i18nisolang1 \
+    i18nlangtag \
     i18nutil \
     lng \
     sal \
diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk
index 1574558e304a..4b0ebdb3224a 100644
--- a/editeng/CppunitTest_editeng_lookuptree.mk
+++ b/editeng/CppunitTest_editeng_lookuptree.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \
     cppu \
     sal \
     salhelper \
-    i18nisolang1 \
+    i18nlangtag \
     i18nutil \
 	$(gb_UWINAPI) \
 ))
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index d21e9a1d0729..bab7ffec4c86 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -139,7 +139,7 @@ $(eval $(call gb_Library_use_libraries,editeng,\
     cppu \
     sal \
     salhelper \
-    i18nisolang1 \
+    i18nlangtag \
     i18nutil \
 	$(gb_UWINAPI) \
 ))
diff --git a/editeng/inc/editeng/SpellPortions.hxx b/editeng/inc/editeng/SpellPortions.hxx
index cbfe086b8670..d8ca7f924b7f 100644
--- a/editeng/inc/editeng/SpellPortions.hxx
+++ b/editeng/inc/editeng/SpellPortions.hxx
@@ -20,7 +20,7 @@
 #ifndef SVX_SPELL_PORTIONS_HXX
 #define SVX_SPELL_PORTIONS_HXX
 
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/linguistic2/SingleProofreadingError.hpp>
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 6161671457c2..83ba64342443 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -28,7 +28,7 @@
 
 #include <rsc/rscsfx.hxx>
 #include <editeng/editdata.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include "editeng/editengdllapi.h"
 
 #include <tools/rtti.hxx>   // due to typedef TypeId
diff --git a/editeng/inc/editeng/editstat.hxx b/editeng/inc/editeng/editstat.hxx
index ac45a7fe5d0f..175267938c91 100644
--- a/editeng/inc/editeng/editstat.hxx
+++ b/editeng/inc/editeng/editstat.hxx
@@ -21,7 +21,7 @@
 #define _EDITSTAT_HXX
 
 #include <tools/string.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 
 #define EE_CNTRL_USECHARATTRIBS     0x00000001  // Use of hard character attributes
 #define EE_CNTRL_USEPARAATTRIBS     0x00000002  // Using paragraph attributes.
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index e84224ad4b43..f3cad0e4c99f 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/i18n/WordType.hpp>
 
 #include <rsc/rscsfx.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
 
diff --git a/editeng/inc/editeng/edtdlg.hxx b/editeng/inc/editeng/edtdlg.hxx
index 6dda1344266e..40cdd5d9b35a 100644
--- a/editeng/inc/editeng/edtdlg.hxx
+++ b/editeng/inc/editeng/edtdlg.hxx
@@ -22,7 +22,7 @@
 #include <tools/solar.h>
 #include <tools/string.hxx>
 #include <editeng/editengdllapi.h>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <vcl/abstdlg.hxx>
 #include <editeng/hangulhanja.hxx>
diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index d3f2b366d02f..8f75e0c2e6b2 100644
--- a/editeng/inc/editeng/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -19,7 +19,7 @@
 #ifndef _SVX_FLDITEM_HXX
 #define _SVX_FLDITEM_HXX
 
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/time.hxx>
 #include <tools/date.hxx>
 #include <svl/poolitem.hxx>
diff --git a/editeng/inc/editeng/hangulhanja.hxx b/editeng/inc/editeng/hangulhanja.hxx
index d88d39284509..4381d756eabe 100644
--- a/editeng/inc/editeng/hangulhanja.hxx
+++ b/editeng/inc/editeng/hangulhanja.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include "editeng/editengdllapi.h"
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 
 //.............................................................................
 namespace editeng
diff --git a/editeng/inc/editeng/langitem.hxx b/editeng/inc/editeng/langitem.hxx
index ff78d9d60139..8a649741c435 100644
--- a/editeng/inc/editeng/langitem.hxx
+++ b/editeng/inc/editeng/langitem.hxx
@@ -20,7 +20,7 @@
 #define _SVX_LANGITEM_HXX
 
 #include <svl/eitem.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 7df693be96ea..9f9c4190d264 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -25,7 +25,7 @@
 #include <svl/brdcst.hxx>
 
 #include <editeng/editdata.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
 #include <vcl/graph.hxx>
diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index 26d1ae5bb88e..f74c2f7a2338 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -24,7 +24,7 @@
 
 #include <o3tl/sorted_vector.hxx>
 #include <tools/rtti.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/time.hxx>
 #include <tools/date.hxx>
 #include <tools/string.hxx>
diff --git a/editeng/inc/editeng/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx
index ec4e77a93778..858157453aa1 100644
--- a/editeng/inc/editeng/svxfont.hxx
+++ b/editeng/inc/editeng/svxfont.hxx
@@ -21,7 +21,7 @@
 
 #include <limits.h>     // USHRT_MAX
 #include <editeng/svxenum.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <vcl/font.hxx>
 #include "editeng/editengdllapi.h"
 
diff --git a/editeng/inc/editeng/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx
index bb5044cc3e70..9e5bba23e56b 100644
--- a/editeng/inc/editeng/unoedsrc.hxx
+++ b/editeng/inc/editeng/unoedsrc.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/accessibility/TextSegment.hpp>
 
 #include <tools/solar.h>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/gen.hxx>
 #include <vcl/mapmod.hxx>
 #include <tools/string.hxx>
diff --git a/editeng/inc/editeng/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx
index afbaec26b85e..09f570228f95 100644
--- a/editeng/inc/editeng/unolingu.hxx
+++ b/editeng/inc/editeng/unolingu.hxx
@@ -20,7 +20,7 @@
 #ifndef _UNO_LINGU_HXX
 #define _UNO_LINGU_HXX
 
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <tools/string.hxx>
 #include <com/sun/star/util/Language.hpp>
 #include <com/sun/star/linguistic2/XLinguServiceManager2.hpp>
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 27c9716a3aa0..57d1434f8e67 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -67,7 +67,7 @@
 #include <editeng/bulletitem.hxx>
 #include <editeng/unolingu.hxx>
 #include <linguistic/lngprops.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <rtl/strbuf.hxx>
 #include <vcl/help.hxx>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index d992a1fe90ad..7a2f349960ad 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/i18n/WordType.hpp>
 #include <vcl/metric.hxx>
 
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <svl/languageoptions.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/langtab.hxx>
@@ -46,7 +46,7 @@
 #include <eerdll2.hxx>
 #include <editeng.hrc>
 #include <helpid.hrc>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <vcl/menu.hxx>
 #include <vcl/window.hxx>
 #include <editeng/acorrcfg.hxx>
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 539be939aa22..87a3d4b77493 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 #include <rtl/ref.hxx>
 
 #include <boost/noncopyable.hpp>
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index dbaf736ff030..896179146d58 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -66,7 +66,7 @@
 #include <com/sun/star/i18n/InputSequenceChecker.hpp>
 #include <com/sun/star/text/CharacterCompressionType.hpp>
 #include <vcl/pdfextoutdevdata.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 1e4ffdb59f4b..f96d83eef2ed 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -34,7 +34,7 @@
 #include <editeng/editview.hxx>
 #include <eehtml.hxx>
 #include <editobj2.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
 
 #include "editxml.hxx"
 
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index cbc0272c9379..87134db022bc 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -37,7 +37,7 @@
 #include <tools/tenccvt.hxx>
 
 #include <rtl/ustring.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <svl/itemset.hxx>
 
 #include <svtools/langtab.hxx>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index cdc9d2ef13ef..fe5981eb5153 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <tools/urlobj.hxx>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
 #include <vcl/svapp.hxx>
 #include <sot/storinfo.hxx>
 #include <svl/fstathelper.hxx>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index e5b95169f076..64f65dbe1e59 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -42,7 +42,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <unotools/localfilehelper.hxx>
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 015dd35d7a10..d6c07e38e6e4 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -28,7 +28,7 @@
 #include <editeng/fhgtitem.hxx>
 
 #include <svl/style.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
 
 #define _OUTLINER_CXX
 #include <editeng/outliner.hxx>
-- 
cgit