rpms/openoffice.org/devel openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.9, 1.10

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

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

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 psprint/inc/psprint/fontmanager.hxx        |   37 +++++-
 psprint/source/fontmanager/fontcache.cxx   |   27 +---
 psprint/source/fontmanager/fontconfig.cxx  |   96 +++++++++++++---
 psprint/source/fontmanager/fontmanager.cxx |    6 -
 vcl/inc/impfont.hxx                        |   36 ++++++
 vcl/inc/outdev.hxx                         |    3 
 vcl/inc/outfont.hxx                        |    4 
 vcl/inc/salgdi.hxx                         |    2 
 vcl/inc/vclenum.hxx                        |   21 +++
 vcl/source/gdi/outdev3.cxx                 |    8 +
 vcl/source/glyphs/gcach_ftyp.cxx           |   78 ++++++++-----
 vcl/source/glyphs/gcach_ftyp.hxx           |    5 
 vcl/unx/inc/pspgraphics.h                  |    1 
 vcl/unx/inc/salgdi.h                       |    1 
 vcl/unx/source/gdi/pspgraphics.cxx         |   30 -----
 vcl/unx/source/gdi/salgdi3.cxx             |  168 +++++++++++++++++++++++++++++
 vcl/unx/source/gdi/xlfd_extd.cxx           |    3 
 vcl/win/inc/salgdi.h                       |    1 
 vcl/win/source/gdi/salgdi3.cxx             |    6 +
 19 files changed, 420 insertions(+), 113 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	9 May 2006 16:54:36 -0000	1.9
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	31 May 2006 23:09:34 -0000	1.10
@@ -736,8 +736,8 @@
                      case fonttype::Type1:
                      {
 -                        int nTokLen = (nTokens > 19 ) ? nTokenPos[19]-nTokenPos[18]-1 : nLen - nTokenPos[18];
-+                        int nTokLen = (nTokens > 17 ) ? nTokenPos[17]-nTokenPos[16]-1 : nLen - nTokenPos[16];
-                         static_cast<PrintFontManager::Type1FontFile*>(pFont)->m_aMetricFile = OString( pLine + nTokenPos[16], nTokLen );
++			int nTokLen = (nTokens > 17 ) ? nTokenPos[17]-nTokenPos[16]-1 : nLen - nTokenPos[16];
+                         static_cast<PrintFontManager::Type1FontFile*>(pFont)->m_aMetricFile = OString( pLine + nTokenPos[18], nTokLen );
                          static_cast<PrintFontManager::Type1FontFile*>(pFont)->m_nDirectory = nDir;
                          static_cast<PrintFontManager::Type1FontFile*>(pFont)->m_aFontFile = aFile;
 @@ -564,8 +557,6 @@