[Libreoffice-commits] core.git: i18nlangtag/source
Noel Grandin
noel at peralex.com
Mon Oct 19 04:06:57 PDT 2015
i18nlangtag/source/isolang/isolang.cxx | 26 ++++++++---------
i18nlangtag/source/isolang/mslangid.cxx | 32 +++++++++++-----------
i18nlangtag/source/languagetag/languagetag.cxx | 30 ++++++++++----------
i18nlangtag/source/languagetag/languagetagicu.cxx | 2 -
4 files changed, 45 insertions(+), 45 deletions(-)
New commits:
commit 6716ceec1c5b1a2ece26f91741253b2673e6e9e2
Author: Noel Grandin <noel at peralex.com>
Date: Mon Oct 19 09:22:51 2015 +0200
com::sun::star->css in i18nlangtag
Change-Id: I8a153a4b3a1bdb8a298c3c76a6b51693c42a0688
Reviewed-on: https://gerrit.libreoffice.org/19444
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 677c7e1..d5589be 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -68,7 +68,7 @@ struct IsoLanguageCountryEntry
OUString getTagString() const;
/** Obtain a locale. */
- ::com::sun::star::lang::Locale getLocale() const;
+ css::lang::Locale getLocale() const;
};
struct IsoLanguageScriptCountryEntry
@@ -82,7 +82,7 @@ struct IsoLanguageScriptCountryEntry
OUString getTagString() const;
/** Obtain a locale. */
- ::com::sun::star::lang::Locale getLocale() const;
+ css::lang::Locale getLocale() const;
/** If rStr starts with maLanguageScript ignoring case.
@@ -102,7 +102,7 @@ struct Bcp47CountryEntry
OUString getTagString() const;
/** Obtain a locale. */
- ::com::sun::star::lang::Locale getLocale() const;
+ css::lang::Locale getLocale() const;
};
struct IsoLangEngEntry
@@ -766,7 +766,7 @@ OUString IsoLanguageCountryEntry::getTagString() const
return OUString::createFromAscii( maLanguage);
}
-::com::sun::star::lang::Locale IsoLanguageCountryEntry::getLocale() const
+css::lang::Locale IsoLanguageCountryEntry::getLocale() const
{
return lang::Locale( OUString::createFromAscii( maLanguage), OUString::createFromAscii( maCountry), OUString());
}
@@ -779,7 +779,7 @@ OUString IsoLanguageScriptCountryEntry::getTagString() const
return OUString::createFromAscii( maLanguageScript);
}
-::com::sun::star::lang::Locale IsoLanguageScriptCountryEntry::getLocale() const
+css::lang::Locale IsoLanguageScriptCountryEntry::getLocale() const
{
return lang::Locale( I18NLANGTAG_QLT, OUString::createFromAscii( maCountry), getTagString());
}
@@ -794,7 +794,7 @@ OUString Bcp47CountryEntry::getTagString() const
return OUString::createFromAscii( mpBcp47);
}
-::com::sun::star::lang::Locale Bcp47CountryEntry::getLocale() const
+css::lang::Locale Bcp47CountryEntry::getLocale() const
{
return lang::Locale( I18NLANGTAG_QLT, OUString::createFromAscii( maCountry), getTagString());
}
@@ -922,7 +922,7 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] =
// static
void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang,
- ::com::sun::star::lang::Locale & rLocale, bool bIgnoreOverride )
+ css::lang::Locale & rLocale, bool bIgnoreOverride )
{
const IsoLanguageScriptCountryEntry* pScriptEntryOverride = NULL;
const IsoLanguageCountryEntry* pEntryOverride = NULL;
@@ -1005,7 +1005,7 @@ Label_Override_Lang_Locale:
// static
-com::sun::star::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageCountryEntry * pEntry )
+css::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageCountryEntry * pEntry )
{
if (pEntry->mnOverride)
{
@@ -1018,7 +1018,7 @@ com::sun::star::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageC
}
// static
-com::sun::star::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageScriptCountryEntry * pEntry )
+css::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageScriptCountryEntry * pEntry )
{
if (pEntry->mnOverride)
{
@@ -1031,8 +1031,8 @@ com::sun::star::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageS
}
// static
-::com::sun::star::lang::Locale MsLangId::Conversion::lookupFallbackLocale(
- const ::com::sun::star::lang::Locale & rLocale )
+css::lang::Locale MsLangId::Conversion::lookupFallbackLocale(
+ const css::lang::Locale & rLocale )
{
// language is lower case in table
OUString aLowerLang = rLocale.Language.toAsciiLowerCase();
@@ -1168,7 +1168,7 @@ LanguageType MsLangId::Conversion::convertPrivateUseToLanguage( const OUString&
// static
LanguageType MsLangId::Conversion::convertLocaleToLanguageImpl(
- const ::com::sun::star::lang::Locale& rLocale )
+ const css::lang::Locale& rLocale )
{
if (rLocale.Language == I18NLANGTAG_QLT)
{
@@ -1215,7 +1215,7 @@ LanguageType MsLangId::Conversion::convertLocaleToLanguageImpl(
// static
-::com::sun::star::lang::Locale MsLangId::Conversion::getOverride( const ::com::sun::star::lang::Locale& rLocale )
+css::lang::Locale MsLangId::Conversion::getOverride( const css::lang::Locale& rLocale )
{
if (rLocale.Language == I18NLANGTAG_QLT)
{
diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx
index 2b3ef35..cec8d9f 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -118,17 +118,17 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa
return nLang;
nLang = getRealLanguage(nLang);
- if (nType != ::com::sun::star::i18n::ScriptType::WEAK && getScriptType(nLang) != nType)
+ if (nType != css::i18n::ScriptType::WEAK && getScriptType(nLang) != nType)
{
switch(nType)
{
- case ::com::sun::star::i18n::ScriptType::ASIAN:
+ case css::i18n::ScriptType::ASIAN:
if (nConfiguredAsianFallback == LANGUAGE_SYSTEM)
nLang = LANGUAGE_CHINESE_SIMPLIFIED;
else
nLang = nConfiguredAsianFallback;
break;
- case ::com::sun::star::i18n::ScriptType::COMPLEX:
+ case css::i18n::ScriptType::COMPLEX:
if (nConfiguredComplexFallback == LANGUAGE_SYSTEM)
nLang = LANGUAGE_HINDI;
else
@@ -147,10 +147,10 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa
// static
-::com::sun::star::lang::Locale MsLangId::Conversion::convertLanguageToLocale(
+css::lang::Locale MsLangId::Conversion::convertLanguageToLocale(
LanguageType nLang, bool bResolveSystem )
{
- ::com::sun::star::lang::Locale aLocale;
+ css::lang::Locale aLocale;
if (!bResolveSystem && simplifySystemLanguages( nLang) == LANGUAGE_SYSTEM)
; // nothing => empty locale
else
@@ -175,7 +175,7 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa
// static
LanguageType MsLangId::Conversion::convertLocaleToLanguage(
- const ::com::sun::star::lang::Locale& rLocale )
+ const css::lang::Locale& rLocale )
{
// empty language => LANGUAGE_SYSTEM
if (rLocale.Language.isEmpty())
@@ -186,8 +186,8 @@ LanguageType MsLangId::Conversion::convertLocaleToLanguage(
// static
-::com::sun::star::lang::Locale MsLangId::getFallbackLocale(
- const ::com::sun::star::lang::Locale & rLocale )
+css::lang::Locale MsLangId::getFallbackLocale(
+ const css::lang::Locale & rLocale )
{
// empty language => LANGUAGE_SYSTEM
if (rLocale.Language.isEmpty())
@@ -248,7 +248,7 @@ bool MsLangId::isSimplifiedChinese( LanguageType nLang )
}
// static
-bool MsLangId::isSimplifiedChinese( const ::com::sun::star::lang::Locale & rLocale )
+bool MsLangId::isSimplifiedChinese( const css::lang::Locale & rLocale )
{
return rLocale.Language == "zh" && !isTraditionalChinese(rLocale);
}
@@ -270,7 +270,7 @@ bool MsLangId::isTraditionalChinese( LanguageType nLang )
}
// static
-bool MsLangId::isTraditionalChinese( const ::com::sun::star::lang::Locale & rLocale )
+bool MsLangId::isTraditionalChinese( const css::lang::Locale & rLocale )
{
return rLocale.Language == "zh" && (rLocale.Country == "TW" || rLocale.Country == "HK" || rLocale.Country == "MO");
}
@@ -351,7 +351,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
case LANGUAGE_USER_KURDISH_SOUTHERN_IRAN:
case LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ:
case LANGUAGE_USER_KYRGYZ_CHINA:
- nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
+ nScript = css::i18n::ScriptType::COMPLEX;
break;
// "Western"
@@ -359,7 +359,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
case LANGUAGE_MONGOLIAN_CYRILLIC_LSO:
case LANGUAGE_USER_KURDISH_SYRIA:
case LANGUAGE_USER_KURDISH_TURKEY:
- nScript = ::com::sun::star::i18n::ScriptType::LATIN;
+ nScript = css::i18n::ScriptType::LATIN;
break;
// currently not knowing scripttype - defaulted to LATIN:
@@ -380,7 +380,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
case LANGUAGE_YUE_CHINESE_HONGKONG & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_JAPANESE & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_KOREAN & LANGUAGE_MASK_PRIMARY:
- nScript = ::com::sun::star::i18n::ScriptType::ASIAN;
+ nScript = css::i18n::ScriptType::ASIAN;
break;
// CTL catcher
@@ -420,13 +420,13 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
case LANGUAGE_USER_MAITHILI_INDIA & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_USER_NKO & LANGUAGE_MASK_PRIMARY:
case LANGUAGE_YIDDISH & LANGUAGE_MASK_PRIMARY:
- nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
+ nScript = css::i18n::ScriptType::COMPLEX;
break;
// Western (actually not necessarily Latin but also Cyrillic,
// for example)
default:
- nScript = ::com::sun::star::i18n::ScriptType::LATIN;
+ nScript = css::i18n::ScriptType::LATIN;
}
break;
}
@@ -461,7 +461,7 @@ bool MsLangId::isNonLatinWestern( LanguageType nLang )
return true;
default:
{
- if (getScriptType( nLang) != com::sun::star::i18n::ScriptType::LATIN)
+ if (getScriptType( nLang) != css::i18n::ScriptType::LATIN)
return false;
LanguageTag aLanguageTag( nLang);
if (aLanguageTag.hasScript())
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 0262a367..2b3567d 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -232,7 +232,7 @@ void LiblangtagDataRef::setupDataPath()
* BCP 47 if available. For now just remove them to not confuse any later
* treatments that check for empty variants. This vendor stuff was never
* supported anyway. */
-static void handleVendorVariant( com::sun::star::lang::Locale & rLocale )
+static void handleVendorVariant( css::lang::Locale & rLocale )
{
if (!rLocale.Variant.isEmpty() && rLocale.Language != I18NLANGTAG_QLT)
rLocale.Variant.clear();
@@ -259,7 +259,7 @@ private:
DECISION_YES
};
- mutable com::sun::star::lang::Locale maLocale;
+ mutable css::lang::Locale maLocale;
mutable OUString maBcp47;
mutable OUString maCachedLanguage; ///< cache getLanguage()
mutable OUString maCachedScript; ///< cache getScript()
@@ -361,7 +361,7 @@ private:
/** Convert Locale to BCP 47 string without resolving system and creating
temporary LanguageTag instances. */
- static OUString convertToBcp47( const com::sun::star::lang::Locale& rLocale );
+ static OUString convertToBcp47( const css::lang::Locale& rLocale );
};
@@ -480,7 +480,7 @@ LanguageTag::LanguageTag( const OUString & rBcp47LanguageTag, bool bCanonicalize
}
-LanguageTag::LanguageTag( const com::sun::star::lang::Locale & rLocale )
+LanguageTag::LanguageTag( const css::lang::Locale & rLocale )
:
maLocale( rLocale),
mnLangID( LANGUAGE_DONTKNOW),
@@ -1030,7 +1030,7 @@ LanguageTag & LanguageTag::reset( const OUString & rBcp47LanguageTag, bool bCano
}
-LanguageTag & LanguageTag::reset( const com::sun::star::lang::Locale & rLocale )
+LanguageTag & LanguageTag::reset( const css::lang::Locale & rLocale )
{
resetVars();
maLocale = rLocale;
@@ -1649,7 +1649,7 @@ OUString LanguageTagImpl::getVariantsFromLangtag()
}
-const com::sun::star::lang::Locale & LanguageTag::getLocale( bool bResolveSystem ) const
+const css::lang::Locale & LanguageTag::getLocale( bool bResolveSystem ) const
{
if (!bResolveSystem && mbSystemLocale)
return theEmptyLocale::get();
@@ -2516,9 +2516,9 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp
// static
-::std::vector< com::sun::star::lang::Locale >::const_iterator LanguageTag::getMatchingFallback(
- const ::std::vector< com::sun::star::lang::Locale > & rList,
- const com::sun::star::lang::Locale & rReference )
+::std::vector< css::lang::Locale >::const_iterator LanguageTag::getMatchingFallback(
+ const ::std::vector< css::lang::Locale > & rList,
+ const css::lang::Locale & rReference )
{
if (rList.empty())
return rList.end();
@@ -2575,7 +2575,7 @@ static bool lcl_isSystem( LanguageType nLangID )
// static
-com::sun::star::lang::Locale LanguageTag::convertToLocale( LanguageType nLangID, bool bResolveSystem )
+css::lang::Locale LanguageTag::convertToLocale( LanguageType nLangID, bool bResolveSystem )
{
if (!bResolveSystem && lcl_isSystem( nLangID))
return lang::Locale();
@@ -2585,7 +2585,7 @@ com::sun::star::lang::Locale LanguageTag::convertToLocale( LanguageType nLangID,
// static
-LanguageType LanguageTag::convertToLanguageType( const com::sun::star::lang::Locale& rLocale, bool bResolveSystem )
+LanguageType LanguageTag::convertToLanguageType( const css::lang::Locale& rLocale, bool bResolveSystem )
{
if (rLocale.Language.isEmpty() && !bResolveSystem)
return LANGUAGE_SYSTEM;
@@ -2595,7 +2595,7 @@ LanguageType LanguageTag::convertToLanguageType( const com::sun::star::lang::Loc
// static
-OUString LanguageTagImpl::convertToBcp47( const com::sun::star::lang::Locale& rLocale )
+OUString LanguageTagImpl::convertToBcp47( const css::lang::Locale& rLocale )
{
OUString aBcp47;
if (rLocale.Language.isEmpty())
@@ -2623,7 +2623,7 @@ OUString LanguageTagImpl::convertToBcp47( const com::sun::star::lang::Locale& rL
// static
-OUString LanguageTag::convertToBcp47( const com::sun::star::lang::Locale& rLocale, bool bResolveSystem )
+OUString LanguageTag::convertToBcp47( const css::lang::Locale& rLocale, bool bResolveSystem )
{
OUString aBcp47;
if (rLocale.Language.isEmpty())
@@ -2658,7 +2658,7 @@ OUString LanguageTag::convertToBcp47( LanguageType nLangID, bool bResolveSystem
// static
-com::sun::star::lang::Locale LanguageTag::convertToLocale( const OUString& rBcp47, bool bResolveSystem )
+css::lang::Locale LanguageTag::convertToLocale( const OUString& rBcp47, bool bResolveSystem )
{
if (rBcp47.isEmpty() && !bResolveSystem)
return lang::Locale();
@@ -2685,7 +2685,7 @@ LanguageType LanguageTag::convertToLanguageTypeWithFallback( const OUString& rBc
// static
-com::sun::star::lang::Locale LanguageTag::convertToLocaleWithFallback( const OUString& rBcp47 )
+css::lang::Locale LanguageTag::convertToLocaleWithFallback( const OUString& rBcp47 )
{
return LanguageTag( rBcp47).makeFallback().getLocale();
}
diff --git a/i18nlangtag/source/languagetag/languagetagicu.cxx b/i18nlangtag/source/languagetag/languagetagicu.cxx
index e088b3c..d97a613 100644
--- a/i18nlangtag/source/languagetag/languagetagicu.cxx
+++ b/i18nlangtag/source/languagetag/languagetagicu.cxx
@@ -17,7 +17,7 @@ icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag & rLanguageTag )
if (rLanguageTag.isIsoLocale())
{
// The simple case.
- const com::sun::star::lang::Locale& rLocale = rLanguageTag.getLocale();
+ const css::lang::Locale& rLocale = rLanguageTag.getLocale();
if (rLocale.Country.isEmpty())
return icu::Locale( OUStringToOString( rLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr());
return icu::Locale(
More information about the Libreoffice-commits
mailing list