diff options
| author | Gregor Hartmann <gh@openoffice.org> | 2002-05-29 06:27:13 +0000 |
|---|---|---|
| committer | Gregor Hartmann <gh@openoffice.org> | 2002-05-29 06:27:13 +0000 |
| commit | 6a453f9b05d1fc3203b48f7b184c676e9c9a9007 (patch) | |
| tree | b666f40e9ec81d9fdf937a988e289cca50f0c1e6 /basic/source | |
| parent | 37ce6b0cc35b57245afb0cfa5241a18e141818b9 (diff) | |
#98836#Assertion in Testtool
Diffstat (limited to 'basic/source')
| -rw-r--r-- | basic/source/app/app.cxx | 30 | ||||
| -rw-r--r-- | basic/source/app/app.hxx | 8 |
2 files changed, 22 insertions, 16 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index 2bbe94399a32..105f8da3fc34 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: gh $ $Date: 2002-04-24 09:19:47 $ + * last change: $Author: gh $ $Date: 2002-05-29 07:27:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -154,9 +154,11 @@ void TestToolDebugMessageFilter( const sal_Char *pString ) if ( aMessage.Search( CByteString("getDateFormatsImpl") ) != STRING_NOTFOUND && aMessage.Search( CByteString("no date formats") ) != STRING_NOTFOUND ) return; - DBG_INSTOUTERROR( DBG_OUT_MSGBOX ) + + aBasicApp.DbgPrintMsgBox( pString ); +/* DBG_INSTOUTERROR( DBG_OUT_MSGBOX ) DBG_ERROR( pString ); - DBG_INSTOUTERROR( DBG_OUT_TESTTOOL ) + DBG_INSTOUTERROR( DBG_OUT_TESTTOOL )*/ } void SAL_CALL osl_TestToolDebugMessageFilter( const sal_Char *pString ) { @@ -374,16 +376,6 @@ Reference< XContentProviderManager > InitializeUCB( void ) */ - -#ifdef DBG_UTIL -// Install filter for OSLAsserts - DbgSetPrintTestTool( TestToolDebugMessageFilter ); - DBG_INSTOUTERROR( DBG_OUT_TESTTOOL ) - - if ( osl_setDebugMessageFunc( osl_TestToolDebugMessageFilter ) ) - DBG_ERROR("osl_setDebugMessageFunc returns non NULL pointer"); -#endif - // Create unconfigured Ucb: /* Sequence< Any > aArgs(1); aArgs[1] = makeAny ( xConfProvider );*/ @@ -412,6 +404,16 @@ Reference< XContentProviderManager > InitializeUCB( void ) void BasicApp::Main( ) { +#ifdef DBG_UTIL +// Install filter for OSLAsserts + DbgPrintMsgBox = DbgGetPrintMsgBox(); + DbgSetPrintTestTool( TestToolDebugMessageFilter ); + DBG_INSTOUTERROR( DBG_OUT_TESTTOOL ) + + if ( osl_setDebugMessageFunc( osl_TestToolDebugMessageFilter ) ) + DBG_ERROR("osl_setDebugMessageFunc returns non NULL pointer"); +#endif + try { #ifdef _USE_UNO diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx index 0ed8b57a2a74..1e67b8bf1476 100644 --- a/basic/source/app/app.hxx +++ b/basic/source/app/app.hxx @@ -2,9 +2,9 @@ * * $RCSfile: app.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: gh $ $Date: 2002-04-24 09:19:47 $ + * last change: $Author: gh $ $Date: 2002-05-29 07:27:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,6 +111,10 @@ public: void SetFocus(); void Wait( BOOL ); DECL_LINK( LateInit, void * ); + +#ifdef DBG_UTIL + DbgPrintLine DbgPrintMsgBox; +#endif }; |