Merge commit 'ooo/DEV300_m103'

Conflicts:
codemaker/source/bonobowrappermaker/corbaoptions.cxx
codemaker/source/cppumaker/cppuoptions.cxx
codemaker/source/cunomaker/cunooptions.cxx
codemaker/source/idlmaker/idloptions.cxx
codemaker/source/javamaker/javaoptions.cxx
cppu/source/typelib/typelib.cxx
idlc/source/options.cxx
offapi/com/sun/star/util/PathSubstitution.idl
offapi/drafts/com/sun/star/form/ListEntryEvent.idl
offapi/drafts/com/sun/star/form/XBindableValue.idl
offapi/drafts/com/sun/star/form/XListEntryListener.idl
offapi/drafts/com/sun/star/form/XListEntrySink.idl
offapi/drafts/com/sun/star/form/XListEntrySource.idl
offapi/drafts/com/sun/star/form/XValueBinding.idl
registry/tools/checksingleton.cxx
registry/tools/options.hxx
registry/tools/regcompare.cxx
registry/tools/regmerge.cxx
sal/cppunittester/cppunittester.cxx
sal/osl/unx/socket.c
sal/osl/w32/diagnose.c
sal/prj/d.lst
sal/rtl/source/alloc_fini.cxx
sal/rtl/source/alloc_global.c
sal/rtl/source/makefile.mk

1 files changed, 11 insertions, 5 deletions

diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
index 36c9c0d5fec1..5425810ae408 100644
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@ -219,6 +219,11 @@ sal_Bool SAL_CALL osl_assertFailedLine (
     oslDebugMessageFunc f = g_pDebugMessageFunc;
     char                szMessage[1024];
 
+    // after reporting the assertion, abort if told so by SAL_DIAGNOSE_ABORT, but *not* if
+    // assertions are routed to some external instance
+    char const * env = getenv( "SAL_DIAGNOSE_ABORT" );
+    sal_Bool const doAbort = ( ( env != NULL ) && ( *env != '\0' ) && ( f == NULL ) );
+
     /* If there's a callback for detailed messages, use it */
     if ( g_pDetailedDebugMessageFunc != NULL )
     {
@@ -228,7 +233,7 @@ sal_Bool SAL_CALL osl_assertFailedLine (
 
     /* if SAL assertions are disabled in general, stop here */
     if ( getenv("DISABLE_SAL_DBGBOX") )
-        return sal_False;
+        return doAbort;
 
     /* format message into buffer */
     if (pszMessage != 0)
@@ -253,9 +258,10 @@ sal_Bool SAL_CALL osl_assertFailedLine (
     /* output backtrace */
     osl_diagnose_backtrace_Impl(f);
 
-    /* release lock and leave, w/o calling osl_breakDebug() */
+    /* release lock and leave */
     pthread_mutex_unlock(&g_mutex);
-    return sal_False;
+
+    return doAbort;
 }
 
 /************************************************************************/
@@ -263,7 +269,7 @@ sal_Bool SAL_CALL osl_assertFailedLine (
 /************************************************************************/
 void SAL_CALL osl_breakDebug()
 {
-    exit(0);
+    abort();
 }
 
 /************************************************************************/
@@ -310,4 +316,4 @@ void osl_trace(char const * pszFormat, ...) {
     va_end(args);
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */