You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.1 KiB
31 lines
1.1 KiB
diff -r 1ddfe565e084 vcl/unx/source/fontmanager/fontconfig.cxx
|
|
--- a/vcl/unx/source/fontmanager/fontconfig.cxx Thu Sep 23 09:39:43 2010 +0100
|
|
+++ b/vcl/unx/source/fontmanager/fontconfig.cxx Thu Sep 23 14:13:17 2010 +0100
|
|
@@ -512,19 +512,24 @@
|
|
for (std::vector<lang_and_family>::const_iterator aIter = families.begin(); aIter != aEnd; ++aIter)
|
|
{
|
|
const char *pLang = (const char*)aIter->first;
|
|
- //perfect
|
|
if( rtl_str_compare(pLang,sFullMatch.getStr() ) == 0)
|
|
{
|
|
+ //perfect match
|
|
candidate = aIter->second;
|
|
break;
|
|
}
|
|
else if( (rtl_str_compare(pLang,sLangMatch.getStr()) == 0) && (!alreadyclosematch))
|
|
{
|
|
+ //fairly close
|
|
candidate = aIter->second;
|
|
alreadyclosematch = true;
|
|
}
|
|
+ else if( (rtl_str_compare(pLang,"en") == 0) && (!alreadyclosematch) )
|
|
+ {
|
|
+ //english name
|
|
+ candidate = aIter->second;
|
|
+ }
|
|
}
|
|
-
|
|
return candidate;
|
|
}
|
|
}
|