vcl/win/source/gdi/salgdi3.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f028d9c08c3c5136a860475be16f1d0fc583ff3c
Author: Eike Rathke <er...@redhat.com>
Date: Fri Jul 12 02:33:05 2013 +0200
use LanguageTag
Change-Id: Ie7e9aac9356a7a9e20945556960f807928e1fede
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 3477033..33e6493 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -507,12 +507,12 @@ namespace
{
//used by 2-level font fallback
ImplDevFontListData* findDevFontListByLocale(const ImplDevFontList
&rDevFontList,
- const com::sun::star::lang::Locale& rLocale )
+ const LanguageTag& rLanguageTag )
{
// get the default font for a specified locale
const utl::DefaultFontConfiguration& rDefaults =
utl::DefaultFontConfiguration::get();
- const OUString aDefault = rDefaults.getUserInterfaceFont(rLocale);
+ const OUString aDefault = rDefaults.getUserInterfaceFont(rLanguageTag);
return rDevFontList.ImplFindByTokenNames(aDefault);
}
}
@@ -522,8 +522,8 @@ namespace
bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern&
rFontSelData, OUString& rMissingChars ) const
{
// guess a locale matching to the missing chars
- com::sun::star::lang::Locale aLocale;
LanguageType eLang = LANGUAGE_DONTKNOW;
+ LanguageTag aLanguageTag( eLang);
sal_Int32 nStrIdx = 0;
const sal_Int32 nStrLen = rMissingChars.getLength();
@@ -533,18 +533,18 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute(
FontSelectPattern& rFon
eLang = MapCharToLanguage( uChar );
if( eLang == LANGUAGE_DONTKNOW )
continue;
- aLocale = LanguageTag( eLang ).getLocale();
+ aLanguageTag.reset( eLang);
break;
}
// fall back to default UI locale if the missing characters are
inconclusive
if( eLang == LANGUAGE_DONTKNOW )
- aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
+ aLanguageTag = Application::GetSettings().GetUILanguageTag();
// first level fallback:
// try use the locale specific default fonts defined in VCL.xcu
const ImplDevFontList* pDevFontList =
ImplGetSVData()->maGDIData.mpScreenFontList;
- /*const*/ ImplDevFontListData* pDevFont =
findDevFontListByLocale(*pDevFontList, aLocale);
+ /*const*/ ImplDevFontListData* pDevFont =
findDevFontListByLocale(*pDevFontList, aLanguageTag);
if( pDevFont )
{
const PhysicalFontFace* pFace = pDevFont->FindBestFontFace(
rFontSelData );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
