obtain LanguageTag from SvtSysLocale

Change-Id: Iaee25f1d92349704eaae45e6582d31dfa718ddcb

2 files changed, 11 insertions, 12 deletions

diff --git a/unotools/inc/unotools/syslocale.hxx b/unotools/inc/unotools/syslocale.hxx
index d10e2c969329..e148504d0940 100644
--- a/unotools/inc/unotools/syslocale.hxx
+++ b/unotools/inc/unotools/syslocale.hxx
@@ -23,15 +23,14 @@
 #include "unotools/unotoolsdllapi.h"
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/charclass.hxx>
+#include <i18npool/languagetag.hxx>
 #include <sal/types.h>
-#include <i18npool/lang.h>
 #include <rtl/textenc.h>
 
 class SvtSysLocale_Impl;
 class SvtSysLocaleOptions;
 
 namespace osl { class Mutex; }
-class LocaleDataWrapper;
 
 /**
     SvtSysLocale provides a refcounted single instance of an application wide
@@ -65,10 +64,8 @@ public:
             const LocaleDataWrapper*    GetLocaleDataPtr() const;
             const CharClass*            GetCharClassPtr() const;
             SvtSysLocaleOptions&        GetOptions() const;
-            com::sun::star::lang::Locale GetLocale() const;
-            LanguageType                GetLanguage() const;
-            com::sun::star::lang::Locale GetUILocale() const;
-            LanguageType                GetUILanguage() const;
+            const LanguageTag&          GetLanguageTag() const;
+            const LanguageTag&          GetUILanguageTag() const;
 
     /** Get the best MIME encoding matching the system locale, or if that isn't
         determinable one that matches the UI locale, or UTF8 if everything else
diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx
index a7d1f84bbe9a..d9bb17e36eda 100644
--- a/unotools/inc/unotools/syslocaleoptions.hxx
+++ b/unotools/inc/unotools/syslocaleoptions.hxx
@@ -26,9 +26,9 @@
 #include <tools/solar.h>
 #include <tools/link.hxx>
 #include <i18npool/lang.h>
+#include <i18npool/languagetag.hxx>
 #include <tools/string.hxx>
 #include <unotools/options.hxx>
-#include <com/sun/star/lang/Locale.hpp>
 
 // bits for broadcasting hints of changes in a SfxSimpleHint, may be combined
 const sal_uLong SYSLOCALEOPTIONS_HINT_LOCALE       = 0x00000001;
@@ -99,14 +99,16 @@ public:
     /// The config string may be empty to denote the SYSTEM locale
             const ::rtl::OUString&  GetLocaleConfigString() const;
             void                SetLocaleConfigString( const ::rtl::OUString& rStr );
-            com::sun::star::lang::Locale GetLocale() const;
-            com::sun::star::lang::Locale GetRealLocale() const;
-            LanguageType        GetRealLanguage() const;
+            /** Get locale set, if empty denotes SYSTEM locale, not resolved
+                to the real locale. */
+            LanguageTag         GetLanguageTag() const;
+            /** Get locale set, always resolved to the real locale. */
+            const LanguageTag&  GetRealLanguageTag() const;
 
     /// The config string may be empty to denote the SYSTEM locale
             void                SetUILocaleConfigString( const ::rtl::OUString& rStr );
-            com::sun::star::lang::Locale GetRealUILocale() const;
-            LanguageType        GetRealUILanguage() const;
+            /** Get UI locale set, always resolved to the real locale. */
+            const LanguageTag&  GetRealUILanguageTag() const;
 
     /// The config string may be empty to denote the default currency of the locale
             const ::rtl::OUString&  GetCurrencyConfigString() const;