rpms/openoffice.org/devel openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.9, 1.10

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.104-use-fontconfig-everywhere.patch 
Log Message:
rh#164327# mono/proportional is not really taken into account by fontconfig

openoffice.org-1.9.104-use-fontconfig-everywhere.patch:
 inc/outdev.h                              |    0 
 inc/outfont.hxx                           |    0 
 inc/psprint/fontmanager.hxx               |    0 
 psprint/inc/psprint/fontmanager.hxx       |    4 
 psprint/source/fontmanager/fontcache.cxx  |    2 
 psprint/source/fontmanager/fontconfig.cxx |   20 +
 source/fontmanager/fontcache.cxx          |    0 
 source/fontmanager/fontconfig.cxx         |    0 
 source/gdi/outdev3.cxx                    |    0 
 util/makefile.mk                          |    0 
 vcl/inc/outdev.h                          |    3 
 vcl/inc/outfont.hxx                       |   15 +
 vcl/source/gdi/outdev3.cxx                |  417 +++++++++++++++++++++++-------
 vcl/util/makefile.mk                      |    2 
 14 files changed, 372 insertions(+), 91 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch	13 Jul 2005 18:54:22 -0000	1.9
+++ openoffice.org-1.9.104-use-fontconfig-everywhere.patch	27 Jul 2005 13:06:16 -0000	1.10
@@ -76,7 +76,7 @@
  // =======================================================================
  
  DBG_NAMEEX( OutputDevice );
-@@ -2670,6 +2674,187 @@ ImplFontCache::~ImplFontCache()
+@@ -2670,6 +2674,193 @@ ImplFontCache::~ImplFontCache()
      }
  }
  
@@ -200,11 +200,17 @@
 +        aValue.type = FcTypeInteger;
 +        aValue.u.i= nSpacing;
 +        FcPatternAddWeak( pPattern, FC_SPACING, aValue, true);
++        if (nSpacing == FC_MONO)
++        {
++                aValue.type = FcTypeString;
++                aValue.u.s = (FcChar8*)"monospace";
++                FcPatternAddWeak( pPattern, FC_FAMILY, aValue, true);
++        }
 +    }
 +
 +    psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
 +
-+    FcConfigSubstitute( rMgr.getFontconfig(), pPattern, FcMatchPattern );
++    FcConfigSubstitute( NULL, pPattern, FcMatchPattern );
 +    FcDefaultSubstitute( pPattern );
 +    FcResult eResult = FcResultNoMatch;
 +    FcPattern* pResult = FcFontMatch( rMgr.getFontconfig(), pPattern, &eResult );