SvtPathOptions with LanguageTag

Change-Id: I33f43c6d0249a6681d451a4be8c5548da4987f9c

5 files changed, 13 insertions, 20 deletions

diff --git a/svtools/inc/svtools/DocumentInfoPreview.hxx b/svtools/inc/svtools/DocumentInfoPreview.hxx
index c6f493c8cf41..167de92636de 100644
--- a/svtools/inc/svtools/DocumentInfoPreview.hxx
+++ b/svtools/inc/svtools/DocumentInfoPreview.hxx
@@ -23,7 +23,7 @@
 #include "sal/config.h"
 
 #include "boost/scoped_ptr.hpp"
-#include "com/sun/star/lang/Locale.hpp"
+#include "i18nlangtag/languagetag.hxx"
 #include "com/sun/star/uno/Reference.hxx"
 #include "svtools/svmedit2.hxx"
 #include "svtools/svtdllapi.h"
@@ -57,7 +57,7 @@ public:
 private:
     ExtMultiLineEdit m_pEditWin;
     boost::scoped_ptr< SvtDocInfoTable_Impl > m_pInfoTable;
-    com::sun::star::lang::Locale m_aLocale;
+    LanguageTag m_aLanguageTag;
 
     void insertEntry(OUString const & title, OUString const & value);
 
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 7ee9dd96d0c0..3380c14a43e5 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -44,7 +44,7 @@ namespace svtools {
 ODocumentInfoPreview::ODocumentInfoPreview(Window * pParent, WinBits nBits):
     Window(pParent, WB_DIALOGCONTROL), m_pEditWin(this, nBits),
     m_pInfoTable(new SvtDocInfoTable_Impl),
-    m_aLocale(SvtPathOptions().GetLocale()) // detect application language
+    m_aLanguageTag(SvtPathOptions().GetLanguageTag()) // detect application language
 {
     m_pEditWin.SetLeftMargin(10);
     m_pEditWin.Show();
@@ -91,7 +91,7 @@ void ODocumentInfoPreview::fill(
         }
         else
         {
-            insertNonempty( DI_MIMETYPE, INetContentTypes::GetPresentation(eTypeID, LanguageTag(m_aLocale)));
+            insertNonempty( DI_MIMETYPE, INetContentTypes::GetPresentation(eTypeID, m_aLanguageTag));
         }
     }
 
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index a682b86fdc45..a7ff10cc2de2 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -598,9 +598,6 @@ OUString SvtDocInfoTable_Impl::GetString( long nId ) const
 SvtFrameWindow_Impl::SvtFrameWindow_Impl( Window* pParent )
   : Window( pParent )
 {
-    // detect application language
-    aLocale = SvtPathOptions().GetLocale();
-
     // create windows and frame
     pEditWin = new ODocumentInfoPreview( this ,WB_LEFT | WB_VSCROLL | WB_READONLY | WB_BORDER | WB_3DLOOK);
     pTextWin = new Window( this );
diff --git a/unotools/inc/unotools/pathoptions.hxx b/unotools/inc/unotools/pathoptions.hxx
index 680a196f7058..ad1d16d19c79 100644
--- a/unotools/inc/unotools/pathoptions.hxx
+++ b/unotools/inc/unotools/pathoptions.hxx
@@ -21,7 +21,7 @@
 
 #include "unotools/unotoolsdllapi.h"
 #include <tools/string.hxx>
-#include <com/sun/star/lang/Locale.hpp>
+#include <i18nlangtag/languagetag.hxx>
 #include <unotools/options.hxx>
 
 #define SVT_SEARCHPATH_DELIMITER      ';'
@@ -121,7 +121,7 @@ public:
     String          ExpandMacros( const String& rPath ) const;
     String          UseVariable( const String& rVar ) const;
     sal_Bool        SearchFile( String& rIniFile, Paths ePath = PATH_USERCONFIG );
-    ::com::sun::star::lang::Locale GetLocale() const;
+    const LanguageTag& GetLanguageTag() const;
     sal_Bool        IsReadonly() const;
 };
 
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 4ca3fa3045ab..c55072f136e9 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -111,7 +111,7 @@ class SvtPathOptions_Impl
         mutable EnumToHandleMap             m_aMapEnumToPropHandle;
         VarNameToEnumMap                    m_aMapVarNamesToEnum;
 
-        ::com::sun::star::lang::Locale      m_aLocale;
+        LanguageTag                         m_aLanguageTag;
         String                              m_aEmptyString;
         mutable ::osl::Mutex                m_aMutex;
 
@@ -174,7 +174,7 @@ class SvtPathOptions_Impl
         OUString   ExpandMacros( const OUString& rPath ) const;
         OUString   UsePathVariables( const OUString& rPath ) const;
 
-        ::com::sun::star::lang::Locale  GetLocale() const { return m_aLocale; }
+        const LanguageTag& GetLanguageTag() const { return m_aLanguageTag; }
 };
 
 // global ----------------------------------------------------------------
@@ -411,7 +411,8 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) const
 // -----------------------------------------------------------------------
 
 SvtPathOptions_Impl::SvtPathOptions_Impl() :
-    m_aPathArray( (sal_Int32)SvtPathOptions::PATH_COUNT )
+    m_aPathArray( (sal_Int32)SvtPathOptions::PATH_COUNT ),
+    m_aLanguageTag( LANGUAGE_DONTKNOW )
 {
     Reference< XComponentContext > xContext = comphelper::getProcessComponentContext();
 
@@ -469,12 +470,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() :
     }
 
     // Set language type!
-    /* FIXME-BCP47 */
-    OUString aLocaleStr( ConfigManager::getLocale() );
-    sal_Int32 nIndex = 0;
-    m_aLocale.Language = aLocaleStr.getToken(0, '-', nIndex );
-    m_aLocale.Country = aLocaleStr.getToken(0, '-', nIndex );
-    m_aLocale.Variant = aLocaleStr.getToken(0, '-', nIndex );
+    m_aLanguageTag.reset( ConfigManager::getLocale() );
 }
 
 // -----------------------------------------------------------------------
@@ -979,9 +975,9 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath )
 
 // -----------------------------------------------------------------------
 
-::com::sun::star::lang::Locale SvtPathOptions::GetLocale() const
+const LanguageTag& SvtPathOptions::GetLanguageTag() const
 {
-    return pImp->GetLocale();
+    return pImp->GetLanguageTag();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */