diff options
Diffstat (limited to 'vcl/generic')
-rw-r--r-- | vcl/generic/fontmanager/fontconfig.cxx | 5 | ||||
-rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 26 | ||||
-rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 5 |
3 files changed, 13 insertions, 23 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 4d02a76a3995..0c3655ccb543 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -104,7 +104,7 @@ namespace class FontCfgWrapper { - FcFontSet* m_pOutlineSet; + FcFontSet* m_pOutlineSet; void addFontSet( FcSetName ); @@ -383,10 +383,9 @@ FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar /* * PrintFontManager::initFontconfig */ -bool PrintFontManager::initFontconfig() +void PrintFontManager::initFontconfig() { FontCfgWrapper::get(); - return true; } namespace diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 37f0bf79b3b7..2b99ca5fd181 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -1195,12 +1195,11 @@ PrintFontManager& PrintFontManager::get() * the PrintFontManager */ -PrintFontManager::PrintFontManager() : - m_nNextFontID( 1 ), - m_pAtoms( new MultiAtomProvider() ), - m_nNextDirAtom( 1 ), - m_pFontCache( NULL ), - m_bFontconfigSuccess( false ) +PrintFontManager::PrintFontManager() + : m_nNextFontID( 1 ) + , m_pAtoms( new MultiAtomProvider() ) + , m_nNextDirAtom( 1 ) + , m_pFontCache( NULL ) { for( unsigned int i = 0; i < SAL_N_ELEMENTS( aAdobeCodes ); i++ ) { @@ -2153,7 +2152,7 @@ void PrintFontManager::initialize() #endif // first try fontconfig - m_bFontconfigSuccess = initFontconfig(); + initFontconfig(); // part one - look for downloadable fonts rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); @@ -2177,7 +2176,7 @@ void PrintFontManager::initialize() // if registering an app-specific fontdir with fontconfig fails // and fontconfig-based substitutions are enabled // then trying to use these app-specific fonts doesn't make sense - if( m_bFontconfigSuccess && !addFontconfigDir( aToken ) ) + if( !addFontconfigDir( aToken ) ) if( bAreFCSubstitutionsEnabled ) continue; m_aFontDirectories.push_back( aToken ); @@ -2188,15 +2187,8 @@ void PrintFontManager::initialize() // protect against duplicate paths boost::unordered_map< OString, int, OStringHash > visited_dirs; - // now that all global and local font dirs are known to fontconfig - // check that there are fonts actually managed by fontconfig - // also don't search directories that fontconfig already did - if( m_bFontconfigSuccess ) - m_bFontconfigSuccess = (countFontconfigFonts( visited_dirs ) > 0); - - // don't search through many directories fontconfig already told us about - if( ! m_bFontconfigSuccess ) - ImplGetSVData()->mpDefInst->FillFontPathList( m_aFontDirectories ); + // Don't search directories that fontconfig already did + countFontconfigFonts( visited_dirs ); // fill XLFD aliases from fonts.alias files initFontsAlias(); diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 4d869c53a0fa..67bb7595b8a1 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -903,9 +903,8 @@ void GenPspGraphics::GetDevFontList( ImplDevFontList *pList ) if (rMgr.getFontFastInfo (*it, aInfo)) AnnounceFonts( pList, aInfo ); - // register platform specific font substitutions if available - if( rMgr.hasFontconfig() ) - SalGenericInstance::RegisterFontSubstitutors( pList ); + // register platform specific font substitutions if available + SalGenericInstance::RegisterFontSubstitutors( pList ); } void GenPspGraphics::GetDevFontSubstList( OutputDevice* pOutDev ) |