diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 11:25:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 11:25:39 +0000 |
| commit | c23ace75308d41fc4ae5b643cd3b75a577db0b1f (patch) | |
| tree | f3aa32844cdf99228dd6f5ad5577c9ab31dfeddf /sal | |
| parent | 1d6e6f7d0a1ff7c7d694350947e99a62801604eb (diff) | |
INTEGRATION: CWS c06 (1.8.88); FILE MERGED
2005/09/29 11:02:31 hro 1.8.88.1: #i53531# Disable error reporting in signal handler if crash reporting is disabled in configuration
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/signal.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/sal/osl/w32/signal.c b/sal/osl/w32/signal.c index 24d23d511869..0db63779bc8f 100644 --- a/sal/osl/w32/signal.c +++ b/sal/osl/w32/signal.c @@ -4,9 +4,9 @@ * * $RCSfile: signal.c,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-08 15:11:51 $ + * last change: $Author: rt $ $Date: 2005-11-11 12:25:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,6 +51,7 @@ typedef struct _oslSignalHandlerImpl struct _oslSignalHandlerImpl* pNext; } oslSignalHandlerImpl; +static sal_Bool bErrorReportingEnabled = sal_True; static sal_Bool bInitSignal = sal_False; static oslMutex SignalListMutex; static oslSignalHandlerImpl* SignalList; @@ -120,6 +121,9 @@ static BOOL ReportCrash( LPEXCEPTION_POINTERS lpEP ) STARTUPINFO StartupInfo; int argi; + if ( !bErrorReportingEnabled ) + return FALSE; + /* Check if crash reporter was disabled by command line */ for ( argi = 1; argi < __argc; argi++ ) @@ -418,3 +422,13 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData) return (Action); } +/*****************************************************************************/ +/* osl_setErrorReporting */ +/*****************************************************************************/ +sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable ) +{ + sal_Bool bOld = bErrorReportingEnabled; + bErrorReportingEnabled = bEnable; + + return bOld; +} |