anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the compare_locale function by relying on Qt's (#9030)

Browse Source
This commit is contained in:
Guillaume Munch 2016-08-28 01:25:41 +01:00
parent f69d11f97b
commit efbec20320
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/support/lstrings.cpp
View File

@ -208,24 +208,7 @@ int compare_no_case(docstring const & s, docstring const & s2)
int compare_locale(docstring const & s, docstring const & s2)
{
// FIXME We have a report that this does not work on windows (bug 9030)
try
{
string const l = to_local8bit(s);
string const r = to_local8bit(s2);
return strcoll(l.c_str(), r.c_str());
}
catch (bad_cast & e)
{
// fall back to builtin sorting
LYXERR0("Could not compare using the current locale: "
<< e.what() << ", using fallback.");
if (s < s2)
return -1;
if (s > s2)
return 1;
return 0;
}
return QString::localeAwareCompare(toqstr(s), toqstr(s2));
}