1 files changed, 15 insertions, 17 deletions

diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 62f36e662ea9..e17457c60525 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -151,7 +151,6 @@ struct DebugData
     USHORT                  bInit;
     DbgPrintLine            pDbgPrintMsgBox;
     DbgPrintLine            pDbgPrintWindow;
-    DbgPrintLine            pDbgPrintShell;
     DbgPrintLine            pDbgPrintTestTool;
     ::std::vector< DbgPrintLine >
                             aDbgPrintUserChannels;
@@ -166,7 +165,6 @@ struct DebugData
         :bInit( FALSE )
         ,pDbgPrintMsgBox( FALSE )
         ,pDbgPrintWindow( NULL )
-        ,pDbgPrintShell( NULL )
         ,pDbgPrintTestTool( NULL )
         ,pProfList( NULL )
         ,pXtorList( NULL )
@@ -1037,9 +1035,7 @@ static void DebugDeInit()
     pData->aDbgData.nTestFlags &= (DBG_TEST_MEM | DBG_TEST_PROFILING);
     pData->aDbgPrintUserChannels.clear();
     pData->pDbgPrintTestTool    = NULL;
-    pData->pDbgPrintShell       = NULL;
     pData->pDbgPrintWindow      = NULL;
-    pData->pDbgPrintShell       = NULL;
     pData->pOldDebugMessageFunc = NULL;
     ImplDbgDeInitLock();
 }
@@ -1199,10 +1195,6 @@ void* DbgFunc( USHORT nAction, void* pParam )
                 pDebugData->pDbgPrintWindow = (DbgPrintLine)(long)pParam;
                 break;
 
-            case DBG_FUNC_SETPRINTSHELL:
-                pDebugData->pDbgPrintShell = (DbgPrintLine)(long)pParam;
-                break;
-
             case DBG_FUNC_SETPRINTTESTTOOL:
                 pDebugData->pDbgPrintTestTool = (DbgPrintLine)(long)pParam;
                 break;
@@ -1739,14 +1731,6 @@ void DbgOut( const sal_Char* pMsg, USHORT nDbgOut, const sal_Char* pFile, USHORT
         if ( pData->pDbgPrintMsgBox )
             pData->pDbgPrintMsgBox( aBufOut );
         else
-            nOut = DBG_OUT_SHELL;
-    }
-
-    if ( nOut == DBG_OUT_SHELL )
-    {
-        if ( pData->pDbgPrintShell )
-            pData->pDbgPrintShell( aBufOut );
-        else
             nOut = DBG_OUT_WINDOW;
     }
 
@@ -1758,14 +1742,28 @@ void DbgOut( const sal_Char* pMsg, USHORT nDbgOut, const sal_Char* pFile, USHORT
             nOut = DBG_OUT_FILE;
     }
 
-    if ( nOut == DBG_OUT_FILE )
+    switch ( nOut )
+    {
+    case DBG_OUT_SHELL:
+        DbgPrintShell( aBufOut );
+        break;
+    case DBG_OUT_FILE:
         ImplDbgPrintFile( aBufOut );
+        break;
+    }
 
     ImplDbgUnlock();
 
     bIn = FALSE;
 }
 
+void DbgPrintShell(char const * message) {
+    fprintf(stderr, "%s\n", message);
+#if defined WNT
+    OutputDebugStringA(message);
+#endif
+}
+
 // -----------------------------------------------------------------------
 
 void DbgOutTypef( USHORT nDbgOut, const sal_Char* pFStr, ... )