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

Resolves: tdf#121520 duplicate languages in dropdown

Change-Id: I5bbde305bf06ac1f754f24eb93e89cb3d9cf6058
Reviewed-on: https://gerrit.libreoffice.org/64869
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst f4212175
...@@ -551,12 +551,15 @@ void LanguageBox::AddLanguages(const std::vector< LanguageType >& rLanguageTypes ...@@ -551,12 +551,15 @@ void LanguageBox::AddLanguages(const std::vector< LanguageType >& rLanguageTypes
if (lcl_isScriptTypeRequested( nLang, nLangList)) if (lcl_isScriptTypeRequested( nLang, nLangList))
{ {
int nAt = ImplTypeToPos(nLang); int nAt = ImplTypeToPos(nLang);
if (nAt == -1) if (nAt != -1)
{ continue;
rEntries.push_back(BuildEntry(nLang)); weld::ComboBoxEntry aNewEntry(BuildEntry(nLang));
if (rEntries.back().sString.isEmpty()) if (aNewEntry.sString.isEmpty())
rEntries.pop_back(); continue;
} if (std::find_if(rEntries.begin(), rEntries.end(),
[=](const weld::ComboBoxEntry& rEntry){ return rEntry.sId == aNewEntry.sId; }) != rEntries.end())
continue;
rEntries.push_back(aNewEntry);
} }
} }
} }
......
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