rpms/openoffice.org/FC-6 openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch, NONE, 1.1 openoffice.org.spec, 1.902, 1.903

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch 
Log Message:
rhbz#213996 n-up printing problem

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

--- NEW FILE openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch ---
Index: source/printergfx/text_gfx.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printergfx/text_gfx.cxx,v
retrieving revision 1.27
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 @@
         {
             convertPfbToPfa (aFontFile, *pFile);
             aFontFile.close ();
+
+	    pFile->setPos(osl_Pos_Current, -1);
+	    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");
         }
         WritePS (pFile, "%%EndResource\n");
         rSuppliedFonts.push_back( aPostScriptName );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -r1.902 -r1.903
--- openoffice.org.spec	9 Nov 2006 10:51:40 -0000	1.902
+++ openoffice.org.spec	9 Nov 2006 14:16:30 -0000	1.903
@@ -141,6 +141,7 @@
 Patch73: openoffice.org-2.0.4.ooo71076.dtrans.64bitdragdrop.patch
 Patch74: openoffice.org-2.0.4.ooo71285.tools.ulongmax.patch
 Patch75: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch76: openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1016,6 +1017,7 @@
 %patch73 -p1 -b .ooo71076.dtrans.64bitdragdrop.patch
 %patch74 -p1 -b .ooo71285.tools.ulongmax.patch
 %patch75 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch76 -p1 -b .ooo71379.psprint.endfeatureonnewline.patch
 
 tar xzf %{SOURCE1}
 
@@ -2544,6 +2546,7 @@
 * 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
+- Resolves: rhbz#213996 openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch
 
 * Tue Nov 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.1
 - add openoffice.org-2.0.4.ooo70601.sd.sal_uInt32_aslong.patch