ooo-build r14233 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue Oct  7 10:59:50 2008
New Revision: 14233
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14233&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/sal-disable-backtrace.diff: make output of
    backtrace optional for osl assertions.



Added:
   trunk/patches/dev300/sal-disable-backtrace.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Oct  7 10:59:50 2008
@@ -2698,6 +2698,7 @@
 # (disabled) debug code extracting SdrOLE streams to some tmp location
 svx-debug-sdrolestreams.diff, thorsten
 instset-macos-langpacks.diff, i#64937, cloph
+sal-disable-backtrace.diff, thorsten
 
 [ ImpressFontSize ]
 [ Fixes <= dev300-m30 <= ooo300-m3 ]

Added: trunk/patches/dev300/sal-disable-backtrace.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sal-disable-backtrace.diff	Tue Oct  7 10:59:50 2008
@@ -0,0 +1,16 @@
+diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
+index c95ed40..57ab708 100644
+--- sal/osl/unx/diagnose.c
++++ sal/osl/unx/diagnose.c
+@@ -247,8 +247,9 @@ sal_Bool SAL_CALL osl_assertFailedLine (
+ 	/* output message buffer */
+     OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
+ 
+-	/* output backtrace */
+-	osl_diagnose_backtrace_Impl(f);
++    /* if SAL backtrace for assertions is disabled, skip here */
++    if ( !getenv("DISABLE_SAL_BACKTRACE") )
++        osl_diagnose_backtrace_Impl(f);
+ 
+ 	/* release lock and leave, w/o calling osl_breakDebug() */
+ 	pthread_mutex_unlock(&g_mutex);