summaryrefslogtreecommitdiff
path: root/vcl/source/font
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-21 08:36:36 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-21 08:36:36 +0100
commit14a219560f0c9812b0df976c9cbe8f3c1a963a98 (patch)
treea5d6aea3e3fb7b271dd0ef57e47cff4f0772c8f6 /vcl/source/font
parent2c387e2018ec56dcec80600bbf50f6c8c43a2b62 (diff)
tweak config-less load path
Change-Id: I1281f7df86e03cd5c9f646232637aeaa66d108ad
Diffstat (limited to 'vcl/source/font')
-rw-r--r--vcl/source/font/PhysicalFontCollection.cxx22
1 files changed, 13 insertions, 9 deletions
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 8ff985b8b1d0..9c0b2a3d3750 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -1237,17 +1237,21 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindByFont( FontSelectPattern& r
return pFoundData;
}
- // use a font name from font fallback list to determine font attributes
- // 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();
- const utl::FontNameAttr* pTempFontAttr = rFontSubst.getSubstInfo( aSearchName );
+ const utl::FontNameAttr* pTempFontAttr = NULL;
+ if (!utl::ConfigManager::IsAvoidConfig())
+ {
+ // use a font name from font fallback list to determine font attributes
+ // 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) )
- pTempFontAttr = rFontSubst.getSubstInfo( aTempShortName );
+ if ( !pTempFontAttr && (aTempShortName != aSearchName) )
+ pTempFontAttr = rFontSubst.getSubstInfo( aTempShortName );
- if ( !pTempFontAttr && (aTempFamilyName != aTempShortName) )
- pTempFontAttr = rFontSubst.getSubstInfo( aTempFamilyName );
+ if ( !pTempFontAttr && (aTempFamilyName != aTempShortName) )
+ pTempFontAttr = rFontSubst.getSubstInfo( aTempFamilyName );
+ }
// try the font substitutions suggested by the fallback info
if( pTempFontAttr )