summaryrefslogtreecommitdiff
path: root/framework
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 /framework
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 'framework')
-rw-r--r--framework/Library_fwe.mk2
-rw-r--r--framework/Library_fwi.mk2
-rw-r--r--framework/Library_fwk.mk2
-rw-r--r--framework/Library_fwl.mk2
-rw-r--r--framework/inc/helper/mischelper.hxx2
-rw-r--r--framework/inc/services/substitutepathvars.hxx2
-rw-r--r--framework/source/accelerators/documentacceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/globalacceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/presethandler.cxx2
-rw-r--r--framework/source/fwi/helper/mischelper.cxx2
-rw-r--r--framework/source/inc/accelerators/presethandler.hxx2
-rw-r--r--framework/source/services/substitutepathvars.cxx2
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx2
-rw-r--r--framework/source/uielement/langselectionstatusbarcontroller.cxx2
14 files changed, 14 insertions, 14 deletions
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 9fd6ec8b0824..482dac4dfc99 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,fwe,\
cppuhelper \
fwi \
sal \
- i18nisolang1 \
+ i18nlangtag \
svl \
svt \
tl \
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 150bd0c56342..6fcd6d2023a3 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,fwi,\
comphelper \
cppu \
cppuhelper \
- i18nisolang1 \
+ i18nlangtag \
sal \
svl \
svt \
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index bf9a3970936c..b1b1660f96d5 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_libraries,fwk,\
cppuhelper \
fwe \
fwi \
- i18nisolang1 \
+ i18nlangtag \
sal \
sot \
svl \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 1ef509946574..fb8b3856771d 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_libraries,fwl,\
cppuhelper \
fwe \
fwi \
- i18nisolang1 \
+ i18nlangtag \
sal \
svl \
svt \
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index f74f69ae907b..2db48ff6d9b9 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -30,7 +30,7 @@
#include <cppuhelper/implbase1.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
#include <svl/languageoptions.hxx>
#include <rtl/ustring.hxx>
#include <fwidllapi.h>
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 532ba184191c..65ebcc30039d 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -43,7 +43,7 @@
#include <rtl/ustring.hxx>
#include <unotools/configitem.hxx>
#include <tools/link.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
namespace framework
{
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 9ef571f4086f..82ffbe68c471 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -44,7 +44,7 @@
#include <com/sun/star/xml/sax/XParser.hpp>
#include <comphelper/sequenceashashmap.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace framework
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 83890281725b..dd3e35594761 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/util/XChangesNotifier.hpp>
#include <vcl/svapp.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <comphelper/configurationhelper.hxx>
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 304f92faca4f..39b9773d9c2a 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -38,7 +38,7 @@
#include <vcl/svapp.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ustrbuf.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
#define SUBSTORAGE_GLOBAL DECLARE_ASCII("global" )
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index 5245808255c8..b8a43a8868fb 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -28,7 +28,7 @@
#include <tools/debug.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <svtools/langtab.hxx>
#include <comphelper/processfactory.hxx>
#include <helper/mischelper.hxx>
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index d5325f9cf093..19853be14932 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -31,7 +31,7 @@
#include <comphelper/processfactory.hxx>
#include <salhelper/singletonref.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace framework
{
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index e26f99a55ec1..cdb13abebaf3 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -34,7 +34,7 @@
#include <osl/security.hxx>
#include <osl/socket.hxx>
#include <osl/process.h>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <tools/urlobj.hxx>
#include <tools/resmgr.hxx>
#include <tools/wldcrd.hxx>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index e3e3669f05a3..eb6ad5b1ee22 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/frame/XPopupMenuController.hpp>
#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
#include <svl/languageoptions.hxx>
#include <svtools/langtab.hxx>
#include <classes/fwlresid.hxx>
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 5c87d7a6d52e..cf9b635b998e 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -37,7 +37,7 @@
#include "sal/types.h"
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/document/XDocumentLanguages.hpp>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/frame/XModule.hpp>
#include <com/sun/star/frame/XModel.hpp>