diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-05-11 08:04:47 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-05-11 08:04:47 +0000 |
commit | 30399f52b8330e963e2255eda35044b102afab58 (patch) | |
tree | 6ba28176644a1f011c54210b46516a1e9f6a449d | |
parent | 01d94183d31d734b85ca5df1b3391bc0cc900b94 (diff) |
INTEGRATION: CWS gh13 (1.67.16); FILE MERGED
2006/12/29 12:41:38 gh 1.67.16.1: updated assertionfilter for standalone testtool
-rw-r--r-- | basic/source/app/app.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index a5d04b4b85be..42991ddfdf21 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -4,9 +4,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.69 $ + * $Revision: 1.70 $ * - * last change: $Author: kz $ $Date: 2007-05-10 15:18:00 $ + * last change: $Author: kz $ $Date: 2007-05-11 09:04:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -149,10 +149,6 @@ void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl ) if ( bIsOsl ) { // OSL - if ( aMessage.Search( CByteString("PropertySetRegistry::") ) != STRING_NOTFOUND ) - bIgnore = TRUE; - if ( aMessage.Search( CByteString("AcquireTree failed") ) != STRING_NOTFOUND ) - bIgnore = TRUE; if ( aMessage.Search( CByteString("Cannot open Configuration: Connector: unknown delegatee com.sun.star.connection.Connector.portal") ) != STRING_NOTFOUND ) bIgnore = TRUE; } @@ -163,13 +159,22 @@ void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl ) if ( aMessage.Search( CByteString("SelectAppIconPixmap") ) != STRING_NOTFOUND ) bIgnore = TRUE; #endif + if ( aMessage.Search( CByteString("PropertySetRegistry::") ) != STRING_NOTFOUND ) + bIgnore = TRUE; if ( aMessage.Search( CByteString("property value missing") ) != STRING_NOTFOUND ) bIgnore = TRUE; if ( aMessage.Search( CByteString("getDateFormatsImpl") ) != STRING_NOTFOUND && aMessage.Search( CByteString("no date formats") ) != STRING_NOTFOUND ) bIgnore = TRUE; + if ( aMessage.Search( CByteString("ucb::configureUcb(): Bad arguments") ) != STRING_NOTFOUND ) + bIgnore = TRUE; + if ( aMessage.Search( CByteString("CreateInstance with arguments exception") ) != STRING_NOTFOUND ) + bIgnore = TRUE; + if ( aMessage.Search( CByteString("AcquireTree failed") ) != STRING_NOTFOUND ) + bIgnore = TRUE; } + if ( bIgnore ) { static_bInsideFilter = FALSE; @@ -189,6 +194,7 @@ void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl ) aBasicApp.DbgPrintMsgBox( pString ); } catch ( ... ) + { printf("DbgPrintMsgBox failed: %s\n", pString ); } |