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

fdo#57950: Remove some chained appends in i18nlangtag

Browse Source 
Change-Id: I1b91f139575a86b19d7a0613d1f563d215b41b9d
Reviewed-on: https://gerrit.libreoffice.org/5601
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
This commit is contained in:
Jelle van der Waa
2013-08-24 11:58:40 +02:00
committed by Eike Rathke
parent 6bdd62ac7b
commit 76fe24cf12
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
i18nlangtag/source/languagetag/languagetag.cxx
View File

@@ -473,10 +473,11 @@ bool LanguageTag::canonicalize()
1 + aCountry.getLength());
aBuf.append( aLanguage);
if (!aScript.isEmpty())
aBuf.append('-').append( aScript);
aBuf.append("-" + aScript);
if (!aCountry.isEmpty())
aBuf.append('-').append( aCountry);
aBuf.append("-" + aCountry);
OUString aStr( aBuf.makeStringAndClear());
if (maBcp47 != aStr)
{
maBcp47 = aStr;
@@ -990,9 +991,7 @@ OUString LanguageTag::getLanguageAndScript() const
OUString aScript( getScript());
if (!aScript.isEmpty())
{
OUStringBuffer aBuf( aLanguageScript.getLength() + 1 + aScript.getLength());
aBuf.append( aLanguageScript).append( '-').append( aScript);
aLanguageScript = aBuf.makeStringAndClear();
aLanguageScript += "-" + aScript;
}
return aLanguageScript;
}
@@ -1414,9 +1413,7 @@ OUString LanguageTag::convertToBcp47( const com::sun::star::lang::Locale& rLocal
aBcp47 = rLocale.Language;
else
{
OUStringBuffer aBuf( rLocale.Language.getLength() + 1 + rLocale.Country.getLength());
aBuf.append( rLocale.Language).append( '-').append( rLocale.Country);
aBcp47 = aBuf.makeStringAndClear();
aBcp47 = rLocale.Language + "-" + rLocale.Country;
}
}
return aBcp47;