rpms/openoffice.org/devel openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.8, 1.9

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.patch 
Log Message:
name changed

openoffice.org-1.9.129.ooo54603.fontconfig.patch:
 psprint/inc/psprint/fontmanager.hxx        |    9 
 psprint/source/fontmanager/fontcache.cxx   |    2 
 psprint/source/fontmanager/fontconfig.cxx  |  265 ++++++++++++++++------
 psprint/source/fontmanager/fontmanager.cxx |    9 
 vcl/inc/outdev.h                           |    3 
 vcl/inc/outfont.hxx                        |   15 +
 vcl/source/gdi/outdev3.cxx                 |  345 ++++++++++++++++++++---------
 vcl/source/window/window.cxx               |    5 
 vcl/util/makefile.mk                       |    2 
 9 files changed, 482 insertions(+), 173 deletions(-)

Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch	9 May 2006 16:54:35 -0000	1.8
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch	9 May 2006 17:44:20 -0000	1.9
@@ -816,8 +816,8 @@
 +    sal_uInt16          nToken = 0;
 +    String              aOrigFontName( GetNextFontToken(rOrigFont.GetName(), nToken) );
 +
-+    const FontSubstConfigItem& rFontSubst = *FontSubstConfigItem::get();
-+    const FontNameAttr* fontAttr = rFontSubst.getSubstInfo( aOrigFontName );
++    
++    const FontNameAttr* fontAttr = FontSubstConfiguration::get()->getSubstInfo( aOrigFontName );
 +
 +    // We dont' actually want to talk to Fontconfig at all for symbol fonts
 +    if ( pFontList && fontAttr && (fontAttr->Type & IMPL_FONT_ATTR_SYMBOL) )