summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Library_deployment.mk2
-rw-r--r--desktop/Library_deploymentgui.mk2
-rw-r--r--desktop/Library_deploymentmisc.mk2
-rw-r--r--desktop/Library_migrationoo2.mk2
-rw-r--r--desktop/Library_sofficeapp.mk2
-rw-r--r--desktop/Library_unopkgapp.mk2
-rw-r--r--desktop/Pagein_common.mk2
-rw-r--r--desktop/source/app/langselect.cxx4
-rw-r--r--desktop/source/app/userinstall.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx2
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx2
-rw-r--r--desktop/source/deployment/inc/dp_resource.h2
-rw-r--r--desktop/source/deployment/misc/dp_resource.cxx2
-rw-r--r--desktop/source/migration/migration.cxx2
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_shared.h2
15 files changed, 16 insertions, 16 deletions
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index dc30097c9511..65596afb6095 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\
ucbhelper \
utl \
xmlscript \
- i18nisolang1 \
+ i18nlangtag \
$(gb_UWINAPI) \
))
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 0dfa88f0e016..ec90d2196742 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\
cppu \
cppuhelper \
deploymentmisc \
- i18nisolang1 \
+ i18nlangtag \
sal \
salhelper \
sfx \
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index f0c01dc69dd6..c0952575c0b9 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\
ucbhelper \
utl \
xmlscript \
- i18nisolang1 \
+ i18nlangtag \
$(gb_UWINAPI) \
))
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 89b73d3bb43f..7fd2a895df77 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_sdk_api,migrationoo2))
$(eval $(call gb_Library_use_libraries,migrationoo2,\
cppu \
cppuhelper \
- i18nisolang1 \
+ i18nlangtag \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmfwk) \
sal \
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 5ae66d259d30..a82d2da2756b 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
cppu \
cppuhelper \
deploymentmisc \
- i18nisolang1 \
+ i18nlangtag \
sal \
salhelper \
sfx \
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 8f79d0ffe64d..b078da4b7a19 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\
ucbhelper \
utl \
vcl \
- i18nisolang1 \
+ i18nlangtag \
$(gb_UWINAPI) \
))
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index 450db2640564..e320d1b70686 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Pagein_Pagein,common))
# sorted in approx. reverse load order (ld.so.1)
$(eval $(call gb_Pagein_add_objects,common,\
$(if $(MERGELIBS),merged) \
- i18npool \
+ i18nlangtag \
$(if $(findstring YES,$(SYSTEM_ICU)),,\
icui18n \
icule \
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 5ac1b0962201..09f0ef901497 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -28,8 +28,8 @@
#include <unotools/pathoptions.hxx>
#include <tools/resid.hxx>
#include <tools/config.hxx>
-#include <i18npool/mslangid.hxx>
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 2a0aba9b8b5d..4a5bb4ed9490 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -41,7 +41,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <i18npool/mslangid.hxx>
+#include <i18nlangtag/mslangid.hxx>
#include <com/sun/star/lang/XLocalizable.hpp>
#include <com/sun/star/lang/Locale.hpp>
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index f81bf57f097b..38abdb675e65 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -27,7 +27,7 @@
#include "comphelper/processfactory.hxx"
#include "comphelper/servicedecl.hxx"
#include "comphelper/unwrapargs.hxx"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include "vcl/svapp.hxx"
#include "vcl/msgbox.hxx"
#include "com/sun/star/lang/XServiceInfo.hpp"
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 2dc584f79696..ccd57d20e1d5 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -23,7 +23,7 @@
#include "unotools/configmgr.hxx"
#include "comphelper/servicedecl.hxx"
#include "comphelper/unwrapargs.hxx"
-#include "i18npool/mslangid.hxx"
+#include "i18nlangtag/mslangid.hxx"
#include "vcl/svapp.hxx"
#include "vcl/msgbox.hxx"
#include "toolkit/helper/vclunohelper.hxx"
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index 9f918780db41..78bf42624b8e 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -22,7 +22,7 @@
#include "tools/string.hxx"
#include "tools/resid.hxx"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include "dp_misc.h"
#include <memory>
#include "dp_misc_api.hxx"
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index c7acb758b95d..0100632c36a5 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -26,7 +26,7 @@
#include "rtl/ustring.h"
#include "cppuhelper/implbase1.hxx"
#include "unotools/configmgr.hxx"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star;
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 56400e0b81a6..cc4eb29f9463 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -34,7 +34,7 @@
#include <unotools/bootstrap.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/uri.hxx>
-#include <i18npool/lang.h>
+#include <i18nlangtag/lang.h>
#include <tools/urlobj.hxx>
#include <osl/file.hxx>
#include <osl/mutex.hxx>
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index 4340e9f8c30a..f063cf6c1e92 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -25,7 +25,7 @@
#include "tools/resmgr.hxx"
#include "rtl/ustring.hxx"
#include "unotools/configmgr.hxx"
-#include <i18npool/languagetag.hxx>
+#include <i18nlangtag/languagetag.hxx>
#define APP_NAME "unopkg"