rpms/openoffice.org/devel openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch, NONE, 1.1 openoffice.org.spec, 1.934, 1.935

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch 
Log Message:
openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch

openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch:
 psprint/source/printergfx/printerjob.cxx |   22 +++++++++++++---------
 source/printergfx/printerjob.cxx         |    0 
 2 files changed, 13 insertions(+), 9 deletions(-)

--- NEW FILE openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch ---
Index: source/printergfx/printerjob.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v
retrieving revision 1.40
diff -u -r1.40 printerjob.cxx
--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx	24 Oct 2006 15:06:47 -0000	1.40
+++ openoffice.org/psprint/source/printergfx/printerjob.cxx	15 Nov 2006 15:51:57 -0000
@@ -1126,16 +1130,20 @@
         }
     }
 
-    // setup code
-    ByteString aLine( "/#copies " );
-    aLine += ByteString::CreateFromInt32( rJob.m_nCopies );
-    aLine +=  " def\n";
-    sal_uInt64 nWritten = 0;
-    bool bSuccess = pFile->write( aLine.GetBuffer(), aLine.Len(), nWritten ) 
-        || nWritten != aLine.Len() ? false : true;
+    bool bSuccess = true;
+    if (rJob.m_nCopies > 1)
+    {
+        // setup code
+        ByteString aLine( "/#copies " );
+        aLine += ByteString::CreateFromInt32( rJob.m_nCopies );
+        aLine +=  " def\n";
+        sal_uInt64 nWritten = 0;
+        bSuccess = pFile->write( aLine.GetBuffer(), aLine.Len(), nWritten ) 
+            || nWritten != aLine.Len() ? false : true;
     
-    if( bSuccess && GetPostscriptLevel( &rJob ) >= 2 )
-        WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" );
+        if( bSuccess && GetPostscriptLevel( &rJob ) >= 2 )
+            WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" );
+    }
 
     bool bFeatureSuccess = writeFeatureList( pFile, rJob, true );
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.934
retrieving revision 1.935
diff -u -r1.934 -r1.935
--- openoffice.org.spec	15 Nov 2006 13:16:36 -0000	1.934
+++ openoffice.org.spec	15 Nov 2006 19:28:52 -0000	1.935
@@ -128,6 +128,7 @@
 Patch62: openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch
 Patch63: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
 Patch64: openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch
+Patch65: openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch
 
 %define instdir %{_libdir}/openoffice.org2.1
 
@@ -992,6 +993,7 @@
 %patch62 -p1 -b .ooo71379.psprint.endfeatureonnewline.patch
 %patch63 -p1 -b .ooo61812.svx.a11ycrash.patch
 %patch64 -p1 -b .ooo71562.svx.64bitcrash.patch
+%patch65 -p1 -b .ooo71570.psprint.noonecopy.patch
 
 tar xzf %{SOURCE1}
 
@@ -2518,6 +2520,7 @@
 * Wed Nov 15 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-3.1
 - next version
 - Resolves: rhbz#215694 add openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch
+- Resolves: rhbz#215582 add openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch
 
 * Fri Nov 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-2.4
 - Resolves: rhbz#214889