rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.13, 1.14 openoffice.org.spec, 1.929, 1.930

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
collate print settings

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/jobset.hxx                           |    0 
 inc/print.hxx                            |    0 
 inc/psprint/ppdparser.hxx                |    0 
 psprint/inc/psprint/ppdparser.hxx        |    4 
 psprint/source/printer/cupsmgr.cxx       |    7 
 psprint/source/printergfx/printerjob.cxx |    3 
 source/dialogs/makefile.mk               |    0 
 source/dialogs/printdlg.cxx              |    0 
 source/gdi/jobset.cxx                    |    0 
 source/printer/cupsmgr.cxx               |    0 
 source/printergfx/printerjob.cxx         |    0 
 svtools/source/dialogs/makefile.mk       |    4 
 svtools/source/dialogs/printdlg.cxx      |  312 ++++++++++++++++++++++++++++++-
 svtools/util/makefile.mk                 |    8 
 util/makefile.mk                         |    0 
 vcl/inc/jobset.hxx                       |    1 
 vcl/inc/print.hxx                        |    1 
 vcl/source/gdi/jobset.cxx                |  174 +++++++++++++++++
 18 files changed, 503 insertions(+), 11 deletions(-)

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	9 Nov 2006 10:48:30 -0000	1.13
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	10 Nov 2006 13:22:52 -0000	1.14
@@ -478,7 +478,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -621,15 +762,170 @@
+@@ -621,15 +762,171 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -579,6 +579,7 @@
 +
 +				SetCopyCount(gtk_print_settings_get_int_with_default (pSettings, GTK_PRINT_SETTINGS_N_COPIES, 1));
 +				EnableCollate(gtk_print_settings_get_collate(pSettings));
++				CheckCollate(gtk_print_settings_get_collate(pSettings));
 +
 +				pStr = 0;
 +


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -r1.929 -r1.930
--- openoffice.org.spec	10 Nov 2006 07:57:35 -0000	1.929
+++ openoffice.org.spec	10 Nov 2006 13:22:52 -0000	1.930
@@ -2516,6 +2516,7 @@
 * Fri Nov 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-2.3
 - Resolves: rhbz#214896 pt/pt_BR translations
 - Resolves: rhbz#214887 pt/pt_BR translations
+- Resolves: rhbz#214973 collate print setting
 
 * Tue Nov 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-2.2
 - Resolves: rhbz#213996 openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch