Simplify this a bit

The return value from addFontconfigDir() was effectively unused after
the recent changes in this code.

Change-Id: I99796442fe3bcaf767f3b804afd417b9d043c2a9

2 files changed, 6 insertions, 13 deletions

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 3c594f545f31..4d9fae12e68d 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -657,13 +657,13 @@ void PrintFontManager::deinitFontconfig()
     FontCfgWrapper::release();
 }
 
-bool PrintFontManager::addFontconfigDir( const OString& rDirName )
+void PrintFontManager::addFontconfigDir( const OString& rDirName )
 {
     // workaround for a stability problems in older FC versions
     // when handling application specific fonts
     const int nVersion = FcGetVersion();
     if( nVersion <= 20400 )
-        return false;
+        return;
     const char* pDirName = rDirName.getStr();
     bool bDirOk = (FcConfigAppFontAddDir(FcConfigGetCurrent(), reinterpret_cast<FcChar8 const *>(pDirName) ) == FcTrue);
 
@@ -672,7 +672,7 @@ bool PrintFontManager::addFontconfigDir( const OString& rDirName )
 #endif
 
     if( !bDirOk )
-        return false;
+        return;
 
     // load dir-specific fc-config file too if available
     const OString aConfFileName = rDirName + "/fc_local.conf";
@@ -686,7 +686,7 @@ bool PrintFontManager::addFontconfigDir( const OString& rDirName )
             fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk );
     }
 
-    return true;
+    return;
 }
 
 static void addtopattern(FcPattern *pPattern,
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 8e7ab173e810..bff7e4e40628 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -759,15 +759,8 @@ void PrintFontManager::initialize()
         {
             OString aToken = aPath.getToken( 0, ';', nIndex );
             normPath( aToken );
-            if ( aToken.isEmpty() )
-            {
-                continue;
-            }
-            // 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( !addFontconfigDir( aToken ) )
-                continue;
+            if (!aToken.isEmpty())
+                addFontconfigDir(aToken);
         } while( nIndex >= 0 );
     }