use LanguageTagIcu

Change-Id: I1e66fa3edb2ddf2b6d6f4cdd25104772ff02c70a

i18npool/source/ordinalsuffix/ordinalsuffix.cxx

@@ -18,6 +18,8 @@
  */
 
 #include <boost/scoped_ptr.hpp>
+#include <i18nlangtag/languagetag.hxx>
+#include <i18nlangtag/languagetagicu.hxx>
 #include <comphelper/processfactory.hxx>
 #include <string.h>
 #include "ordinalsuffix.hxx"
@@ -25,8 +27,6 @@
 #include <unicode/rbnf.h>
 #include <unicode/normlzr.h>
 
-#define CSTR( ouStr ) OUStringToOString( ouStr, RTL_TEXTENCODING_UTF8 ).getStr( )
-
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
@@ -72,10 +72,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
 
     // Get the value from ICU
     UErrorCode nCode = U_ZERO_ERROR;
-    const icu::Locale rIcuLocale(
-            CSTR( aLocale.Language ),
-            CSTR( aLocale.Country ),
-            CSTR( aLocale.Variant ) );
+    const icu::Locale rIcuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( aLocale)));
 
     icu::RuleBasedNumberFormat formatter(icu::URBNF_ORDINAL, rIcuLocale, nCode);
     if (!U_SUCCESS(nCode))