You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2024/01/14 16:29:48 UTC
(openoffice) branch AOO41X updated: Ensure default substitutions on patterns
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 96cc864ad7 Ensure default substitutions on patterns
96cc864ad7 is described below
commit 96cc864ad79ef0ed2b9769f074673a55e4056b44
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Sun Jan 14 01:54:48 2024 +0100
Ensure default substitutions on patterns
This is requested by the documentation of function FcFontMatch().
Addresses bug #128583.
(cherry picked from commit 9e383899f55d91dcbf240aac96faa852c30bbdbd)
---
main/vcl/unx/generic/fontmanager/fontconfig.cxx | 1 +
1 file changed, 1 insertion(+)
diff --git a/main/vcl/unx/generic/fontmanager/fontconfig.cxx b/main/vcl/unx/generic/fontmanager/fontconfig.cxx
index 4397cfb20e..312436db1d 100644
--- a/main/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/main/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -456,6 +456,7 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName )
if( m_nFcVersion > 20400 ) // #i115204# avoid trouble with old FC versions
{
FcPattern* pTestPattern = FcPatternDuplicate( pOrigPattern );
+ FcDefaultSubstitute( pTestPattern );
FcPatternAddBool( pTestPattern, FC_OUTLINE, FcTrue );
// TODO: ignore all attributes that are not interesting for finding dupes
// e.g. by using pattern->ImplFontAttr->pattern conversion