diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-25 14:06:47 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-25 16:17:09 +0100 |
commit | 86088dda6e893faaecfea19bad6e0e6c1ffa657c (patch) | |
tree | 8e64e634135436e5026d5263d6827307b86151dd /tools | |
parent | Adapt to sal/log.hxx (diff) | |
download | core-86088dda6e893faaecfea19bad6e0e6c1ffa657c.tar.gz core-86088dda6e893faaecfea19bad6e0e6c1ffa657c.zip |
osl_setDetailedDebugMessageFunc is effectively doing nothing
...since the osl/diagnose.h macros got rebased onto sal/log.hxx, so remove the
corresponding tools/debug.h functionality.
Change-Id: Ife4b5b1a2608230d0dbfc3fa8852243c89ed292f
Diffstat (limited to 'tools')
-rw-r--r-- | tools/source/debug/debug.cxx | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index 885a5c62b073..a52f1e48156e 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -117,9 +117,6 @@ struct DebugData PointerList* pProfList; PointerList* pXtorList; DbgTestSolarMutexProc pDbgTestSolarMutex; - pfunc_osl_printDetailedDebugMessage - pOldDebugMessageFunc; - bool bOslIsHooked; DebugData() :bInit( false ) @@ -129,8 +126,6 @@ struct DebugData ,pProfList( NULL ) ,pXtorList( NULL ) ,pDbgTestSolarMutex( NULL ) - ,pOldDebugMessageFunc( NULL ) - ,bOslIsHooked( false ) { aDbgData.nTestFlags = DBG_TEST_RESOURCE; aDbgData.bOverwrite = true; @@ -140,7 +135,6 @@ struct DebugData #else aDbgData.nErrorOut = DBG_OUT_MSGBOX; #endif - aDbgData.bHookOSLAssert = true; aDbgData.aDebugName[0] = 0; aDbgData.aInclFilter[0] = 0; aDbgData.aExclFilter[0] = 0; @@ -631,7 +625,6 @@ static DebugData* GetDebugData() lcl_tryReadConfigString( pLine, nLineLength, "exclude_class", aDebugData.aDbgData.aExclClassFilter, sizeof( aDebugData.aDbgData.aExclClassFilter ) ); lcl_tryReadOutputChannel( pLine, nLineLength, "trace", &aDebugData.aDbgData.nTraceOut ); lcl_tryReadOutputChannel( pLine, nLineLength, "error", &aDebugData.aDbgData.nErrorOut ); - lcl_tryReadConfigBoolean( pLine, nLineLength, "oslhook", &aDebugData.aDbgData.bHookOSLAssert ); } // elements of the [gui] section @@ -809,23 +802,10 @@ static bool ImplDbgFilter( const sal_Char* pFilter, const sal_Char* pMsg, return false; } -extern "C" -void SAL_CALL dbg_printOslDebugMessage( const sal_Char * pszFileName, sal_Int32 nLine, const sal_Char * pszMessage ) -{ - DbgOut( pszMessage ? pszMessage : "assertion failed!", DBG_OUT_ERROR, pszFileName, (sal_uInt16)nLine ); -} - static void DebugInit() { bDbgImplInMain = true; ImplDbgInitLock(); - - DebugData* pData = GetDebugData(); - if( pData->aDbgData.bHookOSLAssert && ! pData->bOslIsHooked ) - { - pData->pOldDebugMessageFunc = osl_setDetailedDebugMessageFunc( &dbg_printOslDebugMessage ); - pData->bOslIsHooked = true; - } } static void DebugDeInit() @@ -835,12 +815,6 @@ static void DebugDeInit() sal_uIntPtr nCount; sal_uIntPtr nOldOut; - if( pData->bOslIsHooked ) - { - osl_setDetailedDebugMessageFunc( pData->pOldDebugMessageFunc ); - pData->bOslIsHooked = false; - } - // Output statistics trace data to file nOldOut = pData->aDbgData.nTraceOut; pData->aDbgData.nTraceOut = DBG_OUT_FILE; @@ -895,7 +869,6 @@ static void DebugDeInit() pData->aDbgData.nTestFlags &= DBG_TEST_PROFILING; pData->aDbgPrintUserChannels.clear(); pData->pDbgPrintWindow = NULL; - pData->pOldDebugMessageFunc = NULL; ImplDbgDeInitLock(); } @@ -1056,7 +1029,6 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam ) lcl_writeConfigString( pIniFile, "exclude_class", pData->aExclClassFilter ); lcl_writeConfigOutChannel( pIniFile, "trace", pData->nTraceOut ); lcl_writeConfigOutChannel( pIniFile, "error", pData->nErrorOut ); - lcl_writeConfigBoolean( pIniFile, "oslhook", pData->bHookOSLAssert ); lcl_lineFeed( pIniFile ); lcl_startSection( pIniFile, eGUI ); @@ -1107,22 +1079,6 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam ) case DBG_FUNC_PRINTFILE: ImplDbgPrintFile( (const sal_Char*)pParam ); break; - case DBG_FUNC_UPDATEOSLHOOK: - { - const DbgData* pData = static_cast< const DbgData* >( pParam ); - pDebugData->aDbgData.bHookOSLAssert = pData->bHookOSLAssert; - if( pDebugData->bOslIsHooked && ! pData->bHookOSLAssert ) - { - osl_setDetailedDebugMessageFunc( pDebugData->pOldDebugMessageFunc ); - pDebugData->bOslIsHooked = false; - } - else if( ! pDebugData->bOslIsHooked && pData->bHookOSLAssert ) - { - pDebugData->pOldDebugMessageFunc = osl_setDetailedDebugMessageFunc( &dbg_printOslDebugMessage ); - pDebugData->bOslIsHooked = true; - } - } - break; } return NULL; |