rpms/openoffice.org/F-12 openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch, 1.5, 1.6

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21832

Modified Files:
	openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch 
Log Message:
Resolves: rhbz#445588 improve same name substitution

openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch:
 psprint/inc/psprint/fontmanager.hxx       |    4 
 psprint/source/fontmanager/fontconfig.cxx |  125 +++++++++++++++++++-----------
 vcl/inc/vcl/outfont.hxx                   |   10 +-
 vcl/source/gdi/outdev3.cxx                |   29 ++++--
 vcl/unx/source/gdi/salgdi3.cxx            |   93 ++++++++++++++++++----
 5 files changed, 188 insertions(+), 73 deletions(-)

Index: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch	9 Feb 2010 12:44:36 -0000	1.5
+++ openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch	9 Feb 2010 13:36:39 -0000	1.6
@@ -178,8 +178,8 @@ diff -ru psprint/source/fontmanager/font
  
  			// update rMissingCodes by removing resolved unicodes
 diff -ru vcl.orig/inc/vcl/outfont.hxx vcl/inc/vcl/outfont.hxx
---- vcl.orig/inc/vcl/outfont.hxx	2010-02-09 12:34:09.000000000 +0000
-+++ vcl/inc/vcl/outfont.hxx	2010-02-09 12:35:39.000000000 +0000
+--- openoffice.org.orig/vcl/inc/vcl/outfont.hxx	2010-02-09 12:34:09.000000000 +0000
++++ openoffice.org/vcl/inc/vcl/outfont.hxx	2010-02-09 12:35:39.000000000 +0000
 @@ -344,15 +344,17 @@
      short               mnOrientation;      // text angle in 3600 system
      bool                mbInit;             // true if maMetric member is valid
@@ -203,8 +203,8 @@ diff -ru vcl.orig/inc/vcl/outfont.hxx vc
  };
  
 diff -ru vcl.orig/source/gdi/outdev3.cxx vcl/source/gdi/outdev3.cxx
---- vcl.orig/source/gdi/outdev3.cxx	2010-02-09 12:34:09.000000000 +0000
-+++ vcl/source/gdi/outdev3.cxx	2010-02-09 12:37:50.000000000 +0000
+--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx	2010-02-09 12:34:09.000000000 +0000
++++ openoffice.org/vcl/source/gdi/outdev3.cxx	2010-02-09 12:37:50.000000000 +0000
 @@ -1528,21 +1528,28 @@
  
  // -----------------------------------------------------------------------
@@ -290,8 +290,8 @@ diff -ru vcl.orig/source/gdi/outdev3.cxx
              }
          }
 diff -ru vcl.orig/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salgdi3.cxx
---- vcl.orig/unx/source/gdi/salgdi3.cxx	2010-02-09 12:34:09.000000000 +0000
-+++ vcl/unx/source/gdi/salgdi3.cxx	2010-02-09 12:34:24.000000000 +0000
+--- openoffice.org.orig/vcl/unx/source/gdi/salgdi3.cxx	2010-02-09 12:34:09.000000000 +0000
++++ openoffice.org/vcl/unx/source/gdi/salgdi3.cxx	2010-02-09 12:34:24.000000000 +0000
 @@ -2037,8 +2037,10 @@
  
  // -----------------------------------------------------------------------