summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-04-10 21:24:04 +0200
committerEike Rathke <erack@redhat.com>2013-04-10 21:26:22 +0200
commit0ed6aa49a88844c3da82c9d0f5b757108f3b090d (patch)
tree1513c31c557048bfdfb542c7b930bcaab2aa3c0d /unotools
parentc0c96884208aadf66e4219000e1f8384b1cb20fd (diff)
SvtPathOptions with LanguageTag
Change-Id: I33f43c6d0249a6681d451a4be8c5548da4987f9c
Diffstat (limited to 'unotools')
-rw-r--r--unotools/inc/unotools/pathoptions.hxx4
-rw-r--r--unotools/source/config/pathoptions.cxx18
2 files changed, 9 insertions, 13 deletions
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: */