Skip to content

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

tweak config-less load path 

Change-Id: I1281f7df86e03cd5c9f646232637aeaa66d108ad
üst 2c387e20
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 9 deletions
vcl/source/font/PhysicalFontCollection.cxx
Dosyayı görüntüle @ 14a21956
...@@ -1237,17 +1237,21 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindByFont( FontSelectPattern& r ...@@ -1237,17 +1237,21 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindByFont( FontSelectPattern& r
return pFoundData; return pFoundData;
} }
// use a font name from font fallback list to determine font attributes const utl::FontNameAttr* pTempFontAttr = NULL;
// get fallback info using FontSubstConfiguration and if (!utl::ConfigManager::IsAvoidConfig())
// the target name, it's shortened name and family name in that order {
const utl::FontSubstConfiguration& rFontSubst = utl::FontSubstConfiguration::get(); // use a font name from font fallback list to determine font attributes
const utl::FontNameAttr* pTempFontAttr = rFontSubst.getSubstInfo( aSearchName ); // get fallback info using FontSubstConfiguration and
// the target name, it's shortened name and family name in that order
const utl::FontSubstConfiguration& rFontSubst = utl::FontSubstConfiguration::get();
pTempFontAttr = rFontSubst.getSubstInfo( aSearchName );
if ( !pTempFontAttr && (aTempShortName != aSearchName) ) if ( !pTempFontAttr && (aTempShortName != aSearchName) )
pTempFontAttr = rFontSubst.getSubstInfo( aTempShortName ); pTempFontAttr = rFontSubst.getSubstInfo( aTempShortName );
if ( !pTempFontAttr && (aTempFamilyName != aTempShortName) ) if ( !pTempFontAttr && (aTempFamilyName != aTempShortName) )
pTempFontAttr = rFontSubst.getSubstInfo( aTempFamilyName ); pTempFontAttr = rFontSubst.getSubstInfo( aTempFamilyName );
}
// try the font substitutions suggested by the fallback info // try the font substitutions suggested by the fallback info
if( pTempFontAttr ) if( pTempFontAttr )
......
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