rpms/openoffice.org/F-7 openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch, NONE, 1.1 openoffice.org.spec, 1.1181, 1.1182

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27035

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch 
Log Message:
Resolves: rhbz#243904 openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch

openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch:

--- NEW FILE openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch ---
Index: unx/source/app/saldata.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/saldata.cxx,v
retrieving revision 1.49.34.2
diff -u -r1.49.34.2 saldata.cxx
--- openoffice.org.orig/vcl/unx/source/app/saldata.cxx	12 Apr 2007 17:18:33 -0000	1.49.34.2
+++ openoffice.org/vcl/unx/source/app/saldata.cxx	13 Jun 2007 12:30:02 -0000
@@ -581,9 +581,9 @@
         else if( pEvent->request_code == X_SetInputFocus )
             return;
 
-#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
+
         PrintXError( pDisplay, pEvent );
-#endif
+
         if( pDisplay != GetX11SalData()->GetDisplay()->GetDisplay() )
             return;
 
@@ -593,10 +593,8 @@
 			case osl_Signal_ActIgnore		:
 				return;
 			case osl_Signal_ActAbortApp 	:
-                PrintXError( pDisplay, pEvent );
 				abort();
 			case osl_Signal_ActKillApp		:
-                PrintXError( pDisplay, pEvent );
 				exit(0);
 			case osl_Signal_ActCallNextHdl	:
 				break;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1181
retrieving revision 1.1182
diff -u -r1.1181 -r1.1182
--- openoffice.org.spec	8 Jun 2007 17:47:30 -0000	1.1181
+++ openoffice.org.spec	13 Jun 2007 12:40:24 -0000	1.1182
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 11
+%define rh_rpm_release 12
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -136,6 +136,7 @@
 Patch77: openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
 Patch78: openoffice.org-2.2.1.ooo77214.rtfprtdata.sw.patch
 Patch79: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
+Patch80: openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1065,6 +1066,7 @@
 %patch77 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
 %patch78 -p1 -b .ooo77214.rtfprtdata.sw.patch
 %patch79 -p1 -b .ooo78198.sixtyfour.svx.patch
+%patch80 -p1 -b .ooo78383.vcl.printxerror.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2642,6 +2644,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jun 13 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.12.UNRELEASED
+- Resolves: rhbz#243904 openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
+
 * Fri Jun 07 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.11
 - Resolves: rhbz#243305 missing xdg file for quickstart restart
 - add openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch