rpms/openoffice.org/devel openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch, NONE, 1.1 openoffice.org.spec, 1.1205, 1.1206
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Jun 13 12:37:58 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26923
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
Log Message:
Resolves: rhbz#243904 add 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/devel/openoffice.org.spec,v
retrieving revision 1.1205
retrieving revision 1.1206
diff -u -r1.1205 -r1.1206
--- openoffice.org.spec 13 Jun 2007 09:53:50 -0000 1.1205
+++ openoffice.org.spec 13 Jun 2007 12:37:22 -0000 1.1206
@@ -143,6 +143,7 @@
Patch77: openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch
Patch78: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.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
@@ -1082,6 +1083,7 @@
%endif
%patch78 -p1 -b .oooXXXXX.selinux.bridges.patch
%patch79 -p1 -b .ooo78198.sixtyfour.svx.patch
+%patch80 -p1 -b .ooo78383.vcl.printxerror.patch
cp %{SOURCE1} extras/source/database/evolocal.odb
@@ -2682,6 +2684,7 @@
- extend selinux patch for ppc64 and sparc
- update stocmerge patch
- Resolves: rhbz#243305 missing xdg file for quickstart restart
+- Resolves: rhbz#243904 add openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
- add workspace.ppc64.patch
* Thu May 31 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.1
More information about the fedora-extras-commits
mailing list