Kaydet (Commit) be214eb2 authored tarafından Caolán McNamara's avatar Caolán McNamara

avoid coverity#1371161 Missing move assignment operator

Change-Id: Ief3dd38ade3fca74ea35e2a1a71637cba3336b59
üst c606f4bf
......@@ -976,7 +976,7 @@ OUString SAL_CALL unicode::formatPercent(double dNumber,
// http://www.unicode.org/cldr/charts/24/by_type/numbers.number_formatting_patterns.html
// so format using French which has the desired rules
if (aLangTag.getLanguage() == "es" || aLangTag.getLanguage() == "sl")
aLangTag = LanguageTag("fr-FR");
aLangTag.reset("fr-FR");
icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag);
......
......@@ -866,15 +866,14 @@ namespace
return bIsImpossible;
}
LanguageTag getExemplarLangTagForCodePoint(sal_uInt32 currentChar)
OUString getExemplarLangTagForCodePoint(sal_uInt32 currentChar)
{
int32_t script = u_getIntPropertyValue(currentChar, UCHAR_SCRIPT);
UScriptCode eScript = static_cast<UScriptCode>(script);
OStringBuffer aBuf(unicode::getExemplarLanguageForUScriptCode(eScript));
const char* pScriptCode = uscript_getShortName(eScript);
if (pScriptCode)
if (const char* pScriptCode = uscript_getShortName(eScript))
aBuf.append('-').append(pScriptCode);
return LanguageTag(OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
return OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8);
}
#if ENABLE_DBUS
......@@ -977,7 +976,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
//#i105784#/rhbz#527719 improve selection of fallback font
if (aLangAttrib.isEmpty())
{
aLangTag = getExemplarLangTagForCodePoint(nCode);
aLangTag.reset(getExemplarLangTagForCodePoint(nCode));
aLangAttrib = mapToFontConfigLangTag(aLangTag);
}
}
......@@ -1109,7 +1108,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
//scripts to default to a given language.
for (sal_Int32 i = 0; i < nRemainingLen; ++i)
{
LanguageTag aOurTag = getExemplarLangTagForCodePoint(pRemainingCodes[i]);
LanguageTag aOurTag(getExemplarLangTagForCodePoint(pRemainingCodes[i]));
OString sTag = OUStringToOString(aOurTag.getBcp47(), RTL_TEXTENCODING_UTF8);
if (m_aPreviousLangSupportRequests.find(sTag) != m_aPreviousLangSupportRequests.end())
continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment