converted to use LanguageTag

Change-Id: I25c5d965d953146e91903cf2ff8e6b58f978ad20

2 files changed, 7 insertions, 9 deletions

diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx
index a6ec4e33522a..aceba1d30410 100644
--- a/unotools/inc/unotools/intlwrapper.hxx
+++ b/unotools/inc/unotools/intlwrapper.hxx
@@ -47,15 +47,13 @@ class UNOTOOLS_DLLPUBLIC IntlWrapper
 {
 private:
 
-    ::com::sun::star::lang::Locale  aLocale;
+            LanguageTag         aLanguageTag;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr;
 
             LocaleDataWrapper*  pLocaleData;
             CollatorWrapper*    pCollator;
             CollatorWrapper*    pCaseCollator;
 
-            LanguageType        eLanguage;
-
             void                ImplNewLocaleData() const;
             void                ImplNewCollator( sal_Bool bCaseSensitive ) const;
 
@@ -71,8 +69,8 @@ public:
                                     );
                                 ~IntlWrapper();
 
-    LanguageType                getLanguage() const { return eLanguage; }
-    const ::com::sun::star::lang::Locale&   getLocale() const { return aLocale; }
+    LanguageType                getLanguage() const { return aLanguageTag.getLanguageType(); }
+    const ::com::sun::star::lang::Locale&   getLocale() const { return aLanguageTag.getLocale(); }
 
     const LocaleDataWrapper*    getLocaleData() const
                                     {
diff --git a/unotools/inc/unotools/transliterationwrapper.hxx b/unotools/inc/unotools/transliterationwrapper.hxx
index 3a0a8de05042..18b7072fdae9 100644
--- a/unotools/inc/unotools/transliterationwrapper.hxx
+++ b/unotools/inc/unotools/transliterationwrapper.hxx
@@ -22,6 +22,7 @@
 #define _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
 #include <tools/string.hxx>
 #include <tools/solar.h>
+#include <i18npool/languagetag.hxx>
 #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
 
 namespace com { namespace sun { namespace star {
@@ -37,9 +38,8 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper
 {
     ::com::sun::star::uno::Reference<
         ::com::sun::star::i18n::XExtendedTransliteration > xTrans;
-    ::com::sun::star::lang::Locale aLocale;
+    LanguageTag aLanguageTag;
     sal_uInt32 nType;
-    sal_uInt16 nLanguage;
     mutable sal_Bool bFirstCall;
 
                                 // not implemented, prevent usage
@@ -57,8 +57,8 @@ public:
     ~TransliterationWrapper();
 
     // get current Locale / Language
-    const ::com::sun::star::lang::Locale& getLocale() const { return aLocale;}
-    sal_uInt16 getLanguage() const { return nLanguage; }
+    const ::com::sun::star::lang::Locale& getLocale() const { return aLanguageTag.getLocale();}
+    sal_uInt16 getLanguage() const { return aLanguageTag.getLanguageType(); }
 
     sal_uInt32 getType() const { return nType; }