diff options
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/Library_utl.mk | 2 | ||||
-rw-r--r-- | unotools/inc/unotools/charclass.hxx | 2 | ||||
-rw-r--r-- | unotools/inc/unotools/intlwrapper.hxx | 4 | ||||
-rw-r--r-- | unotools/inc/unotools/lingucfg.hxx | 2 | ||||
-rw-r--r-- | unotools/inc/unotools/localedatawrapper.hxx | 2 | ||||
-rw-r--r-- | unotools/inc/unotools/syslocale.hxx | 2 | ||||
-rw-r--r-- | unotools/inc/unotools/syslocaleoptions.hxx | 4 | ||||
-rw-r--r-- | unotools/inc/unotools/textsearch.hxx | 2 | ||||
-rw-r--r-- | unotools/inc/unotools/transliterationwrapper.hxx | 2 | ||||
-rw-r--r-- | unotools/source/config/fontcfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/lingucfg.cxx | 4 | ||||
-rw-r--r-- | unotools/source/config/syslocaleoptions.cxx | 4 | ||||
-rw-r--r-- | unotools/source/i18n/intlwrapper.cxx | 2 | ||||
-rw-r--r-- | unotools/source/i18n/localedatawrapper.cxx | 2 | ||||
-rw-r--r-- | unotools/source/i18n/textsearch.cxx | 2 | ||||
-rw-r--r-- | unotools/source/i18n/transliterationwrapper.cxx | 2 |
16 files changed, 20 insertions, 20 deletions
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index dcef7a82155a..66717c90b993 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_libraries,utl,\ comphelper \ cppu \ cppuhelper \ - i18nisolang1 \ + i18nlangtag \ sal \ salhelper \ tl \ diff --git a/unotools/inc/unotools/charclass.hxx b/unotools/inc/unotools/charclass.hxx index c08e84c7d0a4..6ea11f62063d 100644 --- a/unotools/inc/unotools/charclass.hxx +++ b/unotools/inc/unotools/charclass.hxx @@ -23,7 +23,7 @@ #include <ctype.h> // isdigit(), isalpha() #include <boost/noncopyable.hpp> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/string.hxx> #include <tools/solar.h> #include <com/sun/star/i18n/KCharacterType.hpp> diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx index 0320d2a8204e..9165be22b414 100644 --- a/unotools/inc/unotools/intlwrapper.hxx +++ b/unotools/inc/unotools/intlwrapper.hxx @@ -24,8 +24,8 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/collatorwrapper.hxx> -#include <i18npool/lang.h> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/lang.h> +#include <i18nlangtag/languagetag.hxx> /** diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx index 88aaa4a5ba56..085bcc0fe260 100644 --- a/unotools/inc/unotools/lingucfg.hxx +++ b/unotools/inc/unotools/lingucfg.hxx @@ -31,7 +31,7 @@ #include <unotools/configitem.hxx> #include <osl/mutex.hxx> #include <unotools/options.hxx> -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <vector> diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx index 1db497abcd3f..78321b6bbb2f 100644 --- a/unotools/inc/unotools/localedatawrapper.hxx +++ b/unotools/inc/unotools/localedatawrapper.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/i18n/LocaleItem.hpp> #include <com/sun/star/i18n/reservedWords.hpp> #include <rtl/ustring.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/readwritemutexguard.hxx> #include "unotools/unotoolsdllapi.h" diff --git a/unotools/inc/unotools/syslocale.hxx b/unotools/inc/unotools/syslocale.hxx index e148504d0940..d32a22139129 100644 --- a/unotools/inc/unotools/syslocale.hxx +++ b/unotools/inc/unotools/syslocale.hxx @@ -23,7 +23,7 @@ #include "unotools/unotoolsdllapi.h" #include <unotools/localedatawrapper.hxx> #include <unotools/charclass.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <sal/types.h> #include <rtl/textenc.h> diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx index b9acc8c4b099..2deffdc734ec 100644 --- a/unotools/inc/unotools/syslocaleoptions.hxx +++ b/unotools/inc/unotools/syslocaleoptions.hxx @@ -25,8 +25,8 @@ #include <rtl/ustring.hxx> #include <tools/solar.h> #include <tools/link.hxx> -#include <i18npool/lang.h> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/lang.h> +#include <i18nlangtag/languagetag.hxx> #include <tools/string.hxx> #include <unotools/options.hxx> diff --git a/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx index 5e4244f209a2..63ab0dece4e3 100644 --- a/unotools/inc/unotools/textsearch.hxx +++ b/unotools/inc/unotools/textsearch.hxx @@ -20,7 +20,7 @@ #ifndef _UNOTOOLS_TEXTSEARCH_HXX #define _UNOTOOLS_TEXTSEARCH_HXX -#include <i18npool/lang.h> +#include <i18nlangtag/lang.h> #include <rtl/ustring.hxx> #include <tools/string.hxx> #include <com/sun/star/uno/Reference.h> diff --git a/unotools/inc/unotools/transliterationwrapper.hxx b/unotools/inc/unotools/transliterationwrapper.hxx index 18b7072fdae9..6d64d40a92f1 100644 --- a/unotools/inc/unotools/transliterationwrapper.hxx +++ b/unotools/inc/unotools/transliterationwrapper.hxx @@ -22,7 +22,7 @@ #define _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX #include <tools/string.hxx> #include <tools/solar.h> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <com/sun/star/i18n/XExtendedTransliteration.hpp> namespace com { namespace sun { namespace star { diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 85cbdb5120d6..223e42ec533a 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <unotools/fontcfg.hxx> #include <unotools/fontdefs.hxx> #include <comphelper/processfactory.hxx> diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index f0e8d131188f..24d8b196a9f8 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -28,8 +28,8 @@ #include <rtl/uri.hxx> #include <rtl/instance.hxx> #include <osl/mutex.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/debug.hxx> #include <tools/string.hxx> #include <unotools/lingucfg.hxx> diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 031c3529dc10..a77612016705 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -21,8 +21,8 @@ #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> #include <rtl/logfile.hxx> -#include <i18npool/mslangid.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/string.hxx> #include <tools/debug.hxx> #include <unotools/syslocaleoptions.hxx> diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index 059f08d9c22a..0382e768ab16 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.cxx @@ -20,7 +20,7 @@ #include "unotools/intlwrapper.hxx" #include <com/sun/star/i18n/CollatorOptions.hpp> -#include <i18npool/mslangid.hxx> +#include <i18nlangtag/mslangid.hxx> #include <comphelper/processfactory.hxx> IntlWrapper::IntlWrapper( diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index d820c8e2b37d..293bd27e36cd 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -27,7 +27,7 @@ #include <unotools/digitgroupingiterator.hxx> #include <tools/string.hxx> #include <tools/debug.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <com/sun/star/i18n/KNumberFormatUsage.hpp> #include <com/sun/star/i18n/KNumberFormatType.hpp> diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 2b51179928f1..7e4a2db179ec 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/TextSearch.hpp> #include <com/sun/star/util/SearchFlags.hpp> diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index 3a41dcb976f6..23d7acbfa374 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -20,7 +20,7 @@ #include <unotools/transliterationwrapper.hxx> #include <tools/debug.hxx> -#include <i18npool/languagetag.hxx> +#include <i18nlangtag/languagetag.hxx> #include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <com/sun/star/i18n/Transliteration.hpp> |