mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exclude language(-Script) only tags from pRegionT==NULL check

Browse Source 
Change-Id: Ie5423578e34a295aad3a03d2b29f3a6b1a6572ce
This commit is contained in:
Eike Rathke
2012-11-22 17:51:11 +01:00
parent 5124b6d83e
commit a4471c3321
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
i18npool/source/languagetag/languagetag.cxx
View File

@@ -584,7 +584,14 @@ rtl::OUString LanguageTag::getRegionFromLangtag() const
if (maBcp47.isEmpty()) if (maBcp47.isEmpty())
return aRegion; return aRegion;
const lt_region_t* pRegionT = lt_tag_get_region( MPLANGTAG); const lt_region_t* pRegionT = lt_tag_get_region( MPLANGTAG);
SAL_WARN_IF( !pRegionT, "i18npool.langtag", "LanguageTag::getRegionFromLangtag: pRegionT==NULL"); // pRegionT==NULL is valid for language only tags, rough check here that
// does not take sophisticated tags into account that actually should have
// a region, check for ll, lll, ll-Ssss and lll-Ssss so that ll-CC and
// lll-CC actually fail.
SAL_WARN_IF( !pRegionT &&
maBcp47.getLength() != 2 && maBcp47.getLength() != 3 &&
maBcp47.getLength() != 7 && maBcp47.getLength() != 8,
"i18npool.langtag", "LanguageTag::getRegionFromLangtag: pRegionT==NULL");
if (!pRegionT) if (!pRegionT)
return aRegion; return aRegion;
const char* pRegion = lt_region_get_tag( pRegionT); const char* pRegion = lt_region_get_tag( pRegionT);