[PATCH] use LanguageTagIcu

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3667

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/3667/1

use LanguageTagIcu

Change-Id: I3ced460cc5a03554dc77e19381af8a5ba202d2ab
---
M i18npool/Library_i18npool.mk
M i18npool/source/breakiterator/breakiterator_unicode.cxx
2 files changed, 4 insertions(+), 4 deletions(-)



diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 955579f..5fe9e2c 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -42,6 +42,7 @@
 	cppu \
 	cppuhelper \
 	i18nlangtag \
+	i18nlangtagicu \
 	i18nutil \
 	sal \
 	$(gb_UWINAPI) \
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 5b24f81..620bba1 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -19,6 +19,8 @@
 
 #include <breakiterator_unicode.hxx>
 #include <localedata.hxx>
+#include <i18nlangtag/languagetag.hxx>
+#include <i18nlangtag/languagetagicu.hxx>
 #include <unicode/uchar.h>
 #include <unicode/locid.h>
 #include <unicode/rbbi.h>
@@ -148,10 +150,7 @@
         }
 
         if (!icuBI->aBreakIterator) {
-            icu::Locale icuLocale(
-                    OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(),
-                    OUStringToOString(rLocale.Country, RTL_TEXTENCODING_ASCII_US).getStr(),
-                    OUStringToOString(rLocale.Variant, RTL_TEXTENCODING_ASCII_US).getStr());
+            icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( rLocale)));
 
             status = U_ZERO_ERROR;
             switch (rBreakType) {

-- 
To view, visit https://gerrit.libreoffice.org/3667
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ced460cc5a03554dc77e19381af8a5ba202d2ab
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke <erack at redhat.com>