rpms/openoffice.org/devel openoffice.org-1.9.115.ooo51673.printing.checkerror.patch, NONE, 1.1 .cvsignore, 1.59, 1.60 openoffice.org.spec, 1.277, 1.278 sources, 1.85, 1.86

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	.cvsignore openoffice.org.spec sources 
Added Files:
	openoffice.org-1.9.115.ooo51673.printing.checkerror.patch 
Log Message:
bump to 1.9.115

openoffice.org-1.9.115.ooo51673.printing.checkerror.patch:
 psprint/source/printer/printerinfomanager.cxx |    3 +--
 psprint/source/printergfx/printerjob.cxx      |    6 +++++-
 source/gdi/print.cxx                          |    0 
 source/printer/printerinfomanager.cxx         |    0 
 source/printergfx/printerjob.cxx              |    0 
 vcl/source/gdi/print.cxx                      |   11 +++++++----
 6 files changed, 13 insertions(+), 7 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51673.printing.checkerror.patch ---
Index: source/printer/printerinfomanager.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printer/printerinfomanager.cxx,v
retrieving revision 1.29
diff -u -p -r1.29 printerinfomanager.cxx
--- openoffice.org.orig/psprint/source/printer/printerinfomanager.cxx	31 May 2005 17:02:11 -0000	1.29
+++ openoffice.org/psprint/source/printer/printerinfomanager.cxx	7 Jul 2005 11:59:49 -0000
@@ -1240,8 +1240,7 @@ FILE* PrinterInfoManager::startSpool( co
 
 int PrinterInfoManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData )
 {
-    pclose( pFile );
-    return 0; // job id ?
+    return (0 == pclose( pFile ));
 }
 
 void PrinterInfoManager::setupJobContextData( JobData& rData )
Index: source/printergfx/printerjob.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v
retrieving revision 1.30
diff -u -p -r1.30 printerjob.cxx
--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx	31 May 2005 17:02:25 -0000	1.30
+++ openoffice.org/psprint/source/printergfx/printerjob.cxx	7 Jul 2005 12:02:22 -0000
@@ -682,7 +682,11 @@ PrinterJob::EndJob ()
 #ifndef MACOSX
     {
         PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get();
-        rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName, maJobTitle, pDestFILE, m_aDocumentJobData );
+        if (0 == rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName, 
+			maJobTitle, pDestFILE, m_aDocumentJobData ))
+		{
+			bSuccess = sal_False;
+		}
     }
 #else
     {
Index: source/gdi/print.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/print.cxx,v
retrieving revision 1.47
diff -u -p -r1.47 print.cxx
--- openoffice.org.orig/vcl/source/gdi/print.cxx	12 Apr 2005 12:19:33 -0000	1.47
+++ openoffice.org/vcl/source/gdi/print.cxx	7 Jul 2005 12:02:36 -0000
@@ -1521,8 +1527,9 @@ BOOL Printer::StartJob( const XubString&
 
 BOOL Printer::EndJob()
 {
+	BOOL bRet = FALSE;
 	if ( !IsJobActive() )
-		return FALSE;
+		return bRet;
 
 	DBG_ASSERT( !mbInPrintPage, "Printer::EndJob() - StartPage() without EndPage() called" );
 
@@ -1534,6 +1541,8 @@ BOOL Printer::EndJob()
 
 		mnCurPage = 0;
 
+		bRet = TRUE;
+
 		if ( mpPrinter )
 		{
 			mbPrinting		= FALSE;
@@ -1541,7 +1550,7 @@ BOOL Printer::EndJob()
 			maJobName.Erase();
 
 			mbDevOutput = FALSE;
-			mpPrinter->EndJob();
+			bRet = mpPrinter->EndJob();
 			// Hier den Drucker nicht asyncron zerstoeren, da es
 			// W95 nicht verkraftet, wenn gleichzeitig gedruckt wird
 			// und ein Druckerobjekt zerstoert wird
@@ -1552,10 +1561,10 @@ BOOL Printer::EndJob()
 		else
 			mpQPrinter->EndQueuePrint();
 
-		return TRUE;
+		return bRet;
 	}
 
-	return FALSE;
+	return bRet;
 }
 
 // -----------------------------------------------------------------------


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	4 Jul 2005 10:03:13 -0000	1.59
+++ .cvsignore	7 Jul 2005 12:28:56 -0000	1.60
@@ -117,3 +117,4 @@
 GSI_cs.sdf
 SRC680_m113.tar.bz2
 SRC680_m114.tar.bz2
+SRC680_m115.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- openoffice.org.spec	7 Jul 2005 07:30:31 -0000	1.277
+++ openoffice.org.spec	7 Jul 2005 12:28:57 -0000	1.278
@@ -1,5 +1,5 @@
-%define ooo2ver 114
-%define ooo_rpm_release 2
+%define ooo2ver 115
+%define ooo_rpm_release 1
 %define build_fc4 0
 %define build_fc5 1
 
@@ -114,6 +114,7 @@
 Patch51: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
 Patch52: openoffice.org-1.9.114.ooo51638.mailmerge.patch
 Patch53: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+Patch54: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -746,6 +747,7 @@
 %patch51 -p1 -b .ooo51637.solenv.pyuno.patch
 %patch52 -p1 -b .ooo51638.mailmerge.patch
 %patch53 -p1 -b .oooXXXXX.nostlport.patch
+%patch54 -p1 -b .ooo51673.printing.checkerror.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped
@@ -890,7 +892,7 @@
 
 done
 #disabled for now until system-db is done
-#if [ $origin == 1 ]; then false; fi
+if [ $origin == 1 ]; then false; fi
 #if [ $pic == 1 ]; then false; fi
 #if [ $executable == 1 ]; then false; fi
 
@@ -2925,6 +2927,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Jul 07 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.115-1
+- bump to next version
+- add openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
+- rpath of ORIGIN complete, enable failure on regression
+
 * Mon Jul 04 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.114-2
 - further split langpacks
 - modify test for $ORIGIN rpaths


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	4 Jul 2005 10:03:13 -0000	1.85
+++ sources	7 Jul 2005 12:28:58 -0000	1.86
@@ -2,4 +2,4 @@
 176aa81d51a6ed28c5e9a14696a8d208  openoffice.org-jakubicons.tar.gz
 6b3bd4b8eb31dd067d4cb2dcc1ba5e12  openoffice.org-myspell-contrib.tar.gz
 11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
-0b341b4bbb8e902e9be81186dd0d717e  SRC680_m114.tar.bz2
+25dbe0683e0ca0cd7570e5e11fefd749  SRC680_m115.tar.bz2