rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.13, 1.14 openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch, 1.1, 1.2 openoffice.org.spec, 1.904, 1.905

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Nov 10 13:24:54 UTC 2006


Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch 
	openoffice.org.spec 
Log Message:
rhbz#214973 collate print setting

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/FC-6/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:51:08 -0000	1.13
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	10 Nov 2006 13:24:51 -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;
 +

openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch:
 psprint/source/printergfx/text_gfx.cxx |    7 +++++++
 source/printergfx/text_gfx.cxx         |    0 
 2 files changed, 7 insertions(+)

Index: openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch	9 Nov 2006 14:16:30 -0000	1.1
+++ openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch	10 Nov 2006 13:24:51 -0000	1.2
@@ -5,7 +5,7 @@
 diff -u -r1.27 text_gfx.cxx
 --- openoffice.org.orig/psprint/source/printergfx/text_gfx.cxx	19 Jun 2006 10:27:19 -0000	1.27
 +++ openoffice.org/psprint/source/printergfx/text_gfx.cxx	8 Nov 2006 17:15:58 -0000
-@@ -799,6 +800,14 @@
+@@ -799,6 +800,13 @@
          {
              convertPfbToPfa (aFontFile, *pFile);
              aFontFile.close ();
@@ -14,7 +14,6 @@
 +	    char lastchar = '\n';
 +    	    sal_uInt64 uBytes(1);
 +    	    pFile->read((void *)(&lastchar), uBytes, uBytes);
-+	    pFile->setPos(osl_Pos_Current, 1);
 +	    if (lastchar != '\n')
 +        	WritePS (pFile, "\n");
          }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.904
retrieving revision 1.905
diff -u -r1.904 -r1.905
--- openoffice.org.spec	9 Nov 2006 15:07:02 -0000	1.904
+++ openoffice.org.spec	10 Nov 2006 13:24:51 -0000	1.905
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.2
+%define rh_rpm_release 5.3
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2545,6 +2545,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Nov 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.3
+- rhbz#214973 collate print setting
+
 * Thu Nov 09 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.2
 - Resolves: rhbz#213996 openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
 - Resolves: rhbz#213996 distinguish properly between ppd and cups option




More information about the fedora-cvs-commits mailing list