summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-25 11:51:33 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-25 16:17:09 +0100
commitff1a592a1f2c8426691bf497a67720a6a91bdaae (patch)
tree3a958ad4855d7f955fdc8759a0d309759d2d453e /tools
parent0e36a13a80465854ba510676fa2baa2e21e67d11 (diff)
Remove unused DBG_FUNC_* slots
Change-Id: Ief6661ed4bb57546014deef5b10d20fc3a4894fe
Diffstat (limited to 'tools')
-rw-r--r--tools/source/debug/debug.cxx20
1 files changed, 1 insertions, 19 deletions
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index bccd8abda58a..885a5c62b073 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -111,7 +111,6 @@ struct DebugData
bool bInit;
DbgPrintLine pDbgPrintMsgBox;
DbgPrintLine pDbgPrintWindow;
- DbgPrintLine pDbgPrintTestTool;
DbgPrintLine pDbgAbort;
::std::vector< DbgPrintLine >
aDbgPrintUserChannels;
@@ -126,7 +125,6 @@ struct DebugData
:bInit( false )
,pDbgPrintMsgBox( NULL )
,pDbgPrintWindow( NULL )
- ,pDbgPrintTestTool( NULL )
,pDbgAbort( NULL )
,pProfList( NULL )
,pXtorList( NULL )
@@ -896,7 +894,6 @@ static void DebugDeInit()
pData->aDbgData.nTraceOut = nOldOut;
pData->aDbgData.nTestFlags &= DBG_TEST_PROFILING;
pData->aDbgPrintUserChannels.clear();
- pData->pDbgPrintTestTool = NULL;
pData->pDbgPrintWindow = NULL;
pData->pOldDebugMessageFunc = NULL;
ImplDbgDeInitLock();
@@ -1012,15 +1009,7 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
if ( nAction == DBG_FUNC_GETDATA )
return (void*)&(pDebugData->aDbgData);
- else if ( nAction == DBG_FUNC_GETPRINTMSGBOX )
- return (void*)(long)(pDebugData->pDbgPrintMsgBox);
- else if ( nAction == DBG_FUNC_FILTERMESSAGE )
- if ( ImplDbgFilterMessage( (const sal_Char*) pParam ) )
- return (void*) -1;
- else
- return (void*) 0; // aka NULL
else
-
{
switch ( nAction )
{
@@ -1044,10 +1033,6 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
pDebugData->pDbgPrintWindow = (DbgPrintLine)(long)pParam;
break;
- case DBG_FUNC_SETPRINTTESTTOOL:
- pDebugData->pDbgPrintTestTool = (DbgPrintLine)(long)pParam;
- break;
-
case DBG_FUNC_SET_ABORT:
pDebugData->pDbgAbort = (DbgPrintLine)(long)pParam;
break;
@@ -1500,10 +1485,7 @@ void DbgOut( const sal_Char* pMsg, sal_uInt16 nDbgOut, const sal_Char* pFile, sa
if ( nOut == DBG_OUT_TESTTOOL )
{
- if ( pData->pDbgPrintTestTool )
- pData->pDbgPrintTestTool( aBufOut );
- else
- nOut = DBG_OUT_MSGBOX;
+ nOut = DBG_OUT_MSGBOX;
}
if ( nOut == DBG_OUT_MSGBOX )