rpms/openoffice.org/devel openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.7, 1.8

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.104-use-fontconfig-everywhere.patch 
Log Message:
rh#160783# set targetname when a font is found

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                |  410 +++++++++++++++++++++++-------
 vcl/util/makefile.mk                      |    2 
 14 files changed, 365 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch	8 Jul 2005 16:32:17 -0000	1.7
+++ openoffice.org-1.9.104-use-fontconfig-everywhere.patch	13 Jul 2005 14:29:54 -0000	1.8
@@ -76,7 +76,7 @@
  // =======================================================================
  
  DBG_NAMEEX( OutputDevice );
-@@ -2670,6 +2674,184 @@ ImplFontCache::~ImplFontCache()
+@@ -2670,6 +2674,186 @@ ImplFontCache::~ImplFontCache()
      }
  }
  
@@ -250,6 +250,8 @@
 +            ImplGetEnglishSearchFontName( aName );
 +            ImplFontSubstitute( aName, FONT_SUBSTITUTE_ALWAYS, pDevSpecific );
 +            pFontFamily = ImplFindBySearchName( aName );
++            if (pFontFamily)
++                pFontSelData->maTargetName = aUserName;
 +        }
 +    }
 +    FcFontSetDestroy( pSet );