Skip to content

C
core
Kaydet (Commit) 0208dc3b authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

more tweaks for config-less load path 

Change-Id: I642de3af09231dd3fcdbd0b56ecb2c6a3c1e9c49
üst 14a21956
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 18 deletions
vcl/source/font/PhysicalFontCollection.cxx
Dosyayı görüntüle @ 0208dc3b
...@@ -902,28 +902,32 @@ PhysicalFontFamily* PhysicalFontCollection::FindDefaultFont() const ...@@ -902,28 +902,32 @@ PhysicalFontFamily* PhysicalFontCollection::FindDefaultFont() const
{ {
// try to find one of the default fonts of the // try to find one of the default fonts of the
// UNICODE, SANSSERIF, SERIF or FIXED default font lists // UNICODE, SANSSERIF, SERIF or FIXED default font lists
const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get(); PhysicalFontFamily* pFoundData = nullptr;
LanguageTag aLanguageTag( OUString( "en")); if (!utl::ConfigManager::IsAvoidConfig())
OUString aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS_UNICODE ); {
PhysicalFontFamily* pFoundData = ImplFindByTokenNames( aFontname ); const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get();
LanguageTag aLanguageTag( OUString( "en"));
OUString aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS_UNICODE );
pFoundData = ImplFindByTokenNames( aFontname );
if( pFoundData ) if( pFoundData )
return pFoundData; return pFoundData;
aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS ); aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS );
pFoundData = ImplFindByTokenNames( aFontname ); pFoundData = ImplFindByTokenNames( aFontname );
if( pFoundData ) if( pFoundData )
return pFoundData; return pFoundData;
aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SERIF ); aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SERIF );
pFoundData = ImplFindByTokenNames( aFontname ); pFoundData = ImplFindByTokenNames( aFontname );
if( pFoundData ) if( pFoundData )
return pFoundData; return pFoundData;
aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::FIXED ); aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::FIXED );
pFoundData = ImplFindByTokenNames( aFontname ); pFoundData = ImplFindByTokenNames( aFontname );
if( pFoundData ) if( pFoundData )
return pFoundData; return pFoundData;
}
// now try to find a reasonable non-symbol font // now try to find a reasonable non-symbol font
......
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