You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/11/25 15:38:27 UTC

svn commit: r1545301 - /openoffice/trunk/main/sal/osl/w32/signal.cxx

Author: hdu
Date: Mon Nov 25 14:38:26 2013
New Revision: 1545301

URL: http://svn.apache.org/r1545301
Log:
#i123747# ignore single step and breakpoint SEH events

Modified:
    openoffice/trunk/main/sal/osl/w32/signal.cxx

Modified: openoffice/trunk/main/sal/osl/w32/signal.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/w32/signal.cxx?rev=1545301&r1=1545300&r2=1545301&view=diff
==============================================================================
--- openoffice/trunk/main/sal/osl/w32/signal.cxx (original)
+++ openoffice/trunk/main/sal/osl/w32/signal.cxx Mon Nov 25 14:38:26 2013
@@ -429,11 +429,12 @@ oslSignalAction SAL_CALL osl_raiseSignal
 void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs)
 {
 	const char* pSEHName = NULL;
-	switch( nSEHCode) {
+	switch( nSEHCode)
+	{
 		case EXCEPTION_ACCESS_VIOLATION:         pSEHName = "SEH Exception: ACCESS VIOLATION"; break;
 		case EXCEPTION_DATATYPE_MISALIGNMENT:    pSEHName = "SEH Exception: DATATYPE MISALIGNMENT"; break;
-//		case EXCEPTION_BREAKPOINT:               pSEHName = "SEH Exception: BREAKPOINT"; break;
-//		case EXCEPTION_SINGLE_STEP:              pSEHName = "SEH Exception: SINGLE STEP"; break;
+		case EXCEPTION_BREAKPOINT:               /*pSEHName = "SEH Exception: BREAKPOINT";*/ break;
+		case EXCEPTION_SINGLE_STEP:              /*pSEHName = "SEH Exception: SINGLE STEP";*/ break;
 		case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:    pSEHName = "SEH Exception: ARRAY BOUNDS EXCEEDED"; break;
 		case EXCEPTION_FLT_DENORMAL_OPERAND:     pSEHName = "SEH Exception: DENORMAL FLOAT OPERAND"; break;
 		case EXCEPTION_FLT_DIVIDE_BY_ZERO:       pSEHName = "SEH Exception: FLOAT DIVIDE_BY_ZERO"; break;
@@ -455,7 +456,9 @@ void win_seh_translator( unsigned nSEHCo
 //		case EXCEPTION_POSSIBLE_DEADLOCK:        pSEHName = "SEH Exception: POSSIBLE DEADLOCK"; break;
 		default:                                 pSEHName = "Unknown SEH Exception"; break;
 	}
-	throw std::runtime_error( pSEHName);
+
+	if( pSEHName)
+		throw std::runtime_error( pSEHName);
 }
 
 sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable )