|
|
@ -27,17 +27,17 @@ diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmana
|
|
|
|
index e4b2f00..5e97bec 100644
|
|
|
|
index e4b2f00..5e97bec 100644
|
|
|
|
--- a/vcl/unx/source/fontmanager/fontconfig.cxx
|
|
|
|
--- a/vcl/unx/source/fontmanager/fontconfig.cxx
|
|
|
|
+++ b/vcl/unx/source/fontmanager/fontconfig.cxx
|
|
|
|
+++ b/vcl/unx/source/fontmanager/fontconfig.cxx
|
|
|
|
@@ -59,6 +59,9 @@
|
|
|
|
@@ -68,6 +68,9 @@
|
|
|
|
#ifndef FC_FT_FACE
|
|
|
|
#ifndef FC_EMBOLDEN
|
|
|
|
#define FC_FT_FACE "ftface"
|
|
|
|
#define FC_EMBOLDEN "embolden"
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
+ #ifndef FC_FONTFORMAT
|
|
|
|
+ #ifndef FC_FONTFORMAT
|
|
|
|
+ #define FC_FONTFORMAT "fontformat"
|
|
|
|
+ #define FC_FONTFORMAT "fontformat"
|
|
|
|
+ #endif
|
|
|
|
+ #endif
|
|
|
|
#ifndef FC_EMBOLDEN
|
|
|
|
#else
|
|
|
|
#define FC_EMBOLDEN "embolden"
|
|
|
|
typedef void FcConfig;
|
|
|
|
#endif
|
|
|
|
typedef void FcObjectSet;
|
|
|
|
@@ -697,6 +700,7 @@
|
|
|
|
@@ -842,6 +845,7 @@
|
|
|
|
FcChar8* file = NULL;
|
|
|
|
FcChar8* file = NULL;
|
|
|
|
FcChar8* family = NULL;
|
|
|
|
FcChar8* family = NULL;
|
|
|
|
FcChar8* style = NULL;
|
|
|
|
FcChar8* style = NULL;
|
|
|
@ -45,7 +45,7 @@ index e4b2f00..5e97bec 100644
|
|
|
|
int slant = 0;
|
|
|
|
int slant = 0;
|
|
|
|
int weight = 0;
|
|
|
|
int weight = 0;
|
|
|
|
int spacing = 0;
|
|
|
|
int spacing = 0;
|
|
|
|
@@ -711,6 +715,7 @@
|
|
|
|
@@ -856,6 +860,7 @@
|
|
|
|
FcResult eSpacRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
|
|
|
|
FcResult eSpacRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
|
|
|
|
FcResult eOutRes = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
|
|
|
|
FcResult eOutRes = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
|
|
|
|
FcResult eIndexRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );
|
|
|
|
FcResult eIndexRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );
|
|
|
@ -53,7 +53,7 @@ index e4b2f00..5e97bec 100644
|
|
|
|
|
|
|
|
|
|
|
|
if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
|
|
|
|
if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
@@ -718,13 +723,14 @@
|
|
|
|
@@ -863,13 +868,14 @@
|
|
|
|
#if (OSL_DEBUG_LEVEL > 2)
|
|
|
|
#if (OSL_DEBUG_LEVEL > 2)
|
|
|
|
fprintf( stderr, "found font \"%s\" in file %s\n"
|
|
|
|
fprintf( stderr, "found font \"%s\" in file %s\n"
|
|
|
|
" weight = %d, slant = %d, style = \"%s\"\n"
|
|
|
|
" weight = %d, slant = %d, style = \"%s\"\n"
|
|
|
@ -69,7 +69,7 @@ index e4b2f00..5e97bec 100644
|
|
|
|
);
|
|
|
|
);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
@@ -751,7 +757,9 @@
|
|
|
|
@@ -904,7 +910,9 @@
|
|
|
|
// not known, analyze font file to get attributes
|
|
|
|
// not known, analyze font file to get attributes
|
|
|
|
// not described by fontconfig (e.g. alias names, PSName)
|
|
|
|
// not described by fontconfig (e.g. alias names, PSName)
|
|
|
|
std::list< OString > aDummy;
|
|
|
|
std::list< OString > aDummy;
|
|
|
|