[openoffice.org/f14/master] abort on XIOError doesn't help us

[Caolan McNamara]

commit 88197e29c0a9f836b5253008c6bdfd5f2afca608
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 3 11:42:33 2010 +0000

    abort on XIOError doesn't help us

 0001-abort-doesn-t-gain-us-anything-here.patch |   27 ++++++++++++++++++++++++
 openoffice.org.spec                            |    8 ++++--
 2 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/0001-abort-doesn-t-gain-us-anything-here.patch b/0001-abort-doesn-t-gain-us-anything-here.patch
new file mode 100644
index 0000000..f8219c6
--- /dev/null
+++ b/0001-abort-doesn-t-gain-us-anything-here.patch
@@ -0,0 +1,27 @@
+From 72244e6e6035ffc211ea7a4fce9aa96de8bc1f76 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 3 Nov 2010 10:16:06 +0000
+Subject: [PATCH] abort doesn't gain us anything here.
+
+abort doesn't gain us anything here except to force abrt automatic bugreports kick
+in, and XIOErrors can't be worked around
+---
+ vcl/unx/source/plugadapt/salplug.cxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
+index 54f9752..ba6bf4a 100644
+--- a/vcl/unx/source/plugadapt/salplug.cxx
++++ b/vcl/unx/source/plugadapt/salplug.cxx
+@@ -284,7 +284,7 @@ void SalAbort( const XubString& rErrorText )
+         std::fprintf( stderr, "Application Error" );
+     else
+         std::fprintf( stderr, "%s", ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
+-    abort();
++    exit(-1);
+ }
+ 
+ const OUString& SalGetDesktopEnvironment()
+-- 
+1.7.3.1
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 89f3dc9..616f113 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -134,6 +134,7 @@ Patch48: openoffice.org-3.2.0.rh642996.vcl.skip-reserved-operators.patch
 Patch49: 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
 Patch50: 0001-include-redland.h-instead-of-librdf.h.patch
 Patch51: 0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
+Patch52: 0001-abort-doesn-t-gain-us-anything-here.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1679,9 +1680,10 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch46 -p1 -b .rh635918.vcl.fix-im-handling.patch
 %patch47 -p1 -b .rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
 %patch48 -p1 -b .rh642996.vcl.skip-reserved-operators.patch
-%patch49 -p1 -b .0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
-%patch50 -p1 -b .0001-include-redland.h-instead-of-librdf.h.patch
-%patch51 -p1 -b .0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
+%patch49 -p1 -b .strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
+%patch50 -p1 -b .include-redland.h-instead-of-librdf.h.patch
+%patch51 -p1 -b .rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
+%patch52 -p1 -b .abort-doesn-t-gain-us-anything-here.patch
 rm -rf l10n/source/kid  # rhbz#639212
 
 %build