[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/font/PhysicalFontCollection.cxx |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 14a219560f0c9812b0df976c9cbe8f3c1a963a98
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 21 08:36:36 2015 +0100

    tweak config-less load path
    
    Change-Id: I1281f7df86e03cd5c9f646232637aeaa66d108ad

diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 8ff985b..9c0b2a3 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 )