[Libreoffice-commits] .: patches/dev300

[Lubos Lunak]

 patches/dev300/apply                      |    1 -
 patches/dev300/sal-disable-backtrace.diff |   23 -----------------------
 2 files changed, 24 deletions(-)

New commits:
commit f7c276db88bd04aed160a604078a04c818511ff3
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Apr 22 16:18:49 2011 +0200

    sal-disable-backtrace.diff removed, kind of upstreamed

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e77a032..c0952da 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1379,7 +1379,6 @@ testing-more-optimizations-ark.diff
 
 # (disabled) debug code extracting SdrOLE streams to some tmp location
 svx-debug-sdrolestreams.diff, thorsten
-sal-disable-backtrace.diff, thorsten
 
 # fix wrong en-US accelerators in Impress
 fix-sd-accelerators.diff, n#463733, i#97088, jholesov
diff --git a/patches/dev300/sal-disable-backtrace.diff b/patches/dev300/sal-disable-backtrace.diff
deleted file mode 100644
index 994b5ca..0000000
--- a/patches/dev300/sal-disable-backtrace.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- sal/osl/unx/diagnose.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git sal/osl/unx/diagnose.c sal/osl/unx/diagnose.c
-index e98910d..13d977c 100644
---- sal/osl/unx/diagnose.c
-+++ sal/osl/unx/diagnose.c
-@@ -248,8 +248,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);
--- 
-1.7.0.1
-