[openoffice.org/f14/master] make patch apply

[Caolan McNamara]

commit 305966eaf1b2c1f8b5255c353436922c2d9aafea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 4 11:01:39 2010 +0000

    make patch apply

 0001-abort-doesn-t-gain-us-anything-here.patch |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/0001-abort-doesn-t-gain-us-anything-here.patch b/0001-abort-doesn-t-gain-us-anything-here.patch
index f8219c6..416511a 100644
--- a/0001-abort-doesn-t-gain-us-anything-here.patch
+++ b/0001-abort-doesn-t-gain-us-anything-here.patch
@@ -13,15 +13,12 @@ diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/sal
 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);
+@@ -281,7 +281,7 @@
+ 		std::fprintf( stderr, "Application Error" );
+ 	else
+ 		std::fprintf( stderr, ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
+-	abort();
++	exit(-1);
  }
  
  const OUString& SalGetDesktopEnvironment()
--- 
-1.7.3.1
-