linguistic/source/lngsvcmgr.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
New commits: commit 628bb5ce3c9774e9b499aad81bae300ef023b25c Author: Eike Rathke <[email protected]> Date: Tue Aug 30 21:23:06 2016 +0200 pass the already available bcp47 string instead of yet another conversion Change-Id: I6ed8428b28300cdd0586d505211e45d76a622115 diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index aefcdde..566d6c4 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -580,20 +580,18 @@ namespace Sequence< OUString > lcl_GetLastFoundSvcs( SvtLinguConfig &rCfg, const OUString &rLastFoundList , - const Locale &rAvailLocale ) + const OUString& rCfgLocaleStr ) { Sequence< OUString > aRes; - OUString aCfgLocaleStr( LanguageTag::convertToBcp47( rAvailLocale ) ); - Sequence< OUString > aNodeNames( rCfg.GetNodeNames(rLastFoundList) ); - bool bFound = lcl_FindEntry( aCfgLocaleStr, aNodeNames); + bool bFound = lcl_FindEntry( rCfgLocaleStr, aNodeNames); if (bFound) { Sequence< OUString > aNames(1); OUString &rNodeName = aNames.getArray()[0]; - rNodeName = rLastFoundList + "/" + aCfgLocaleStr; + rNodeName = rLastFoundList + "/" + rCfgLocaleStr; Sequence< Any > aValues( rCfg.GetProperties( aNames ) ); if (aValues.getLength()) { @@ -741,7 +739,7 @@ void LngSvcMgr::UpdateAll() aLastFoundSvcs[k][ aCfgLocaleStr ] = aAvailSvcs; Sequence< OUString > aLastSvcs( - lcl_GetLastFoundSvcs( aCfg, aLastFoundList , pAvailLocale[i] )); + lcl_GetLastFoundSvcs( aCfg, aLastFoundList , aCfgLocaleStr )); Sequence< OUString > aNewSvcs = lcl_GetNewEntries( aLastSvcs, aAvailSvcs ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
