rpms/openoffice.org/devel openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
Log Message:
bah

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 inc/outfont.hxx                            |    0 
 inc/psprint/fontmanager.hxx                |    0 
 inc/vclenum.hxx                            |    0 
 psprint/inc/psprint/fontmanager.hxx        |   22 ++++++-
 psprint/source/fontmanager/fontconfig.cxx  |   91 +++++++++++++++++++----------
 psprint/source/fontmanager/fontmanager.cxx |    8 ++
 source/fontmanager/fontconfig.cxx          |    0 
 source/fontmanager/fontmanager.cxx         |    0 
 source/glyphs/gcach_ftyp.cxx               |    0 
 source/glyphs/gcach_ftyp.hxx               |    0 
 unx/source/gdi/xlfd_extd.cxx               |    0 
 vcl/inc/outfont.hxx                        |    6 +
 vcl/inc/vclenum.hxx                        |   22 +++++++
 vcl/source/glyphs/gcach_ftyp.cxx           |   71 +++++++++++++++-------
 vcl/source/glyphs/gcach_ftyp.hxx           |    6 +
 vcl/unx/source/gdi/xlfd_extd.cxx           |    4 +
 vcl/win/source/gdi/salgdi3.cxx             |    9 ++
 win/source/gdi/salgdi3.cxx                 |    0 
 18 files changed, 185 insertions(+), 54 deletions(-)

Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 11:37:19 -0000	1.3
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 12:22:27 -0000	1.4
@@ -114,7 +114,7 @@
              if( eOutRes == FcResultMatch && ! outline )
                  continue;
  
-+	    rWrapper.FcConfigSubstitute( pConfig, pFSet->fonts[i], FcMatchFont );
++	    rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pFSet->fonts[i], FcMatchFont );
 +	    rWrapper.FcDefaultSubstitute( pFSet->fonts[i] );
 +            FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_EMBEDDED_BITMAP, 0, &embitmap );
 +            FcResult eAntialias      = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_ANTIALIAS, 0, &antialias );