diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-29 22:15:01 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-30 01:36:52 +0200 |
| commit | a7c51323b7343f82b5aea6098f5d5e31a8bad0e9 (patch) | |
| tree | f207bd0390063f89aac4fd0e52b69e9e13890a0c /vcl | |
| parent | aef0a650d35620692b2451c684d38a2b3fecf5a0 (diff) | |
Drop check for ancient FontConfig releases
FontConfig 2.4.1 that fixes this bug was released 10 years ago.
Change-Id: Ib0970d3916909fe14eb4e3ed1425f925a13160ad
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 4d9fae12e68d..9a58e91037a4 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -221,8 +221,7 @@ FcFontSet* FontCfgWrapper::getFontSet() { m_pOutlineSet = FcFontSetCreate(); addFontSet( FcSetSystem ); - if( FcGetVersion() > 20400 ) // #i85462# prevent crashes - addFontSet( FcSetApplication ); + addFontSet( FcSetApplication ); ::std::sort(m_pOutlineSet->fonts,m_pOutlineSet->fonts+m_pOutlineSet->nfont,SortFont()); } @@ -659,11 +658,6 @@ void PrintFontManager::deinitFontconfig() 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; const char* pDirName = rDirName.getStr(); bool bDirOk = (FcConfigAppFontAddDir(FcConfigGetCurrent(), reinterpret_cast<FcChar8 const *>(pDirName) ) == FcTrue); |