rpms/openoffice.org/devel openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.5, 1.6

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29906

Modified Files:
	openoffice.org-1.9.104-use-fontconfig-everywhere.patch 
Log Message:
rh#161272# use FcPatternAdd instead of FcPatternAddWeak on family name

openoffice.org-1.9.104-use-fontconfig-everywhere.patch:
 psprint/source/fontmanager/fontcache.cxx |    2 
 vcl/inc/outdev.h                         |    3 
 vcl/inc/outfont.hxx                      |   15 +
 vcl/source/gdi/outdev3.cxx               |  405 ++++++++++++++++++++++++-------
 vcl/util/makefile.mk                     |    2 
 5 files changed, 337 insertions(+), 90 deletions(-)

Index: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.104-use-fontconfig-everywhere.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch	29 Jun 2005 14:44:52 -0000	1.5
+++ openoffice.org-1.9.104-use-fontconfig-everywhere.patch	7 Jul 2005 10:13:18 -0000	1.6
@@ -85,7 +85,7 @@
 +        OString maTargetName = OUStringToOString( GetNextFontToken(pFontSelData->GetFamilyName(), nToken), RTL_TEXTENCODING_UTF8 );
 +        aValue.type = FcTypeString;
 +        aValue.u.s = (FcChar8*)maTargetName.getStr();
-+        FcPatternAddWeak( pPattern, FC_FAMILY, aValue, true);
++        FcPatternAdd( pPattern, FC_FAMILY, aValue, true);
 +    }
 +
 +    ByteString aLangAttrib = ConvertLanguageToIsoByteString( pFontSelData->meLanguage );