rpms/openoffice.org/devel openoffice.org-1.9.121.rh127576.gnomeprintui.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-serv11139

Modified Files:
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch 
Log Message:
my gnomeprint patch must have made it upstream

openoffice.org-1.9.121.rh127576.gnomeprintui.patch:
 configuration/ppds/SGENPRT.PS                |    0 
 configuration/psprint.conf                   |    0 
 inc/jobset.hxx                               |    0 
 inc/print.hxx                                |    0 
 psprint/source/printer/cupsmgr.cxx           |    7 
 psprint_config/configuration/ppds/SGENPRT.PS |    2 
 psprint_config/configuration/psprint.conf    |    2 
 source/dialogs/makefile.mk                   |    0 
 source/dialogs/printdlg.cxx                  |    0 
 source/gdi/jobset.cxx                        |    0 
 source/printer/cupsmgr.cxx                   |    0 
 svtools/source/dialogs/makefile.mk           |    4 
 svtools/source/dialogs/printdlg.cxx          |  523 ++++++++++++++++++++++++++-
 svtools/util/makefile.mk                     |    8 
 util/makefile.mk                             |    0 
 vcl/inc/jobset.hxx                           |    1 
 vcl/inc/print.hxx                            |    1 
 vcl/source/gdi/jobset.cxx                    |  194 ++++++++++
 18 files changed, 737 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch	31 Aug 2005 09:39:17 -0000	1.8
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch	8 Sep 2005 17:06:04 -0000	1.9
@@ -328,7 +328,7 @@
 diff -u -p -r1.20 printdlg.cxx
 --- openoffice.org.orig/svtools/source/dialogs/printdlg.cxx	3 Feb 2004 17:02:46 -0000	1.20
 +++ openoffice.org/svtools/source/dialogs/printdlg.cxx	22 Aug 2005 10:58:49 -0000
-@@ -109,8 +109,50 @@
+@@ -109,8 +109,49 @@
  #include <comphelper/processfactory.hxx>
  #endif
  
@@ -356,7 +356,6 @@
 +#include <osl/process.h>
 +#define WE_ARE_LIBGNOMEPRINT_INTERNALS
 +#include <libgnomeprint/private/gpa-utils.h>
-+G_END_DECLS //gnome#311253#
 +#include <libgnomeprint/gnome-print-config.h>
 +#include <libgnomeprint/gnome-print.h>
 +#include <libgnomeprint/private/gpa-printer.h>