From 305b90c9999781f24421845c9e896563f5183b7e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 2 Jan 2015 17:08:48 +0100 Subject: OSL_FAIL -> SAL_WARN Change-Id: I82ce1030e69f8794c9fdbdc138541e5d7e0541d4 --- cppu/source/uno/data.cxx | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'cppu') diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index e2d8b6f4e5cd..818506b71b0a 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -36,10 +36,6 @@ using namespace ::cppu; using namespace ::osl; -#if OSL_DEBUG_LEVEL > 1 -using namespace ::rtl; -#endif - namespace cppu { @@ -97,19 +93,13 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p } else { -#if OSL_DEBUG_LEVEL > 1 - OUStringBuffer buf( 128 ); - buf.append( "### exception occurred querying for interface " ); - buf.append( * reinterpret_cast< OUString const * >( &pDestType->pTypeName ) ); - buf.append( ": [" ); - buf.append( * reinterpret_cast< OUString const * >( &pExc->pType->pTypeName ) ); - buf.append( "] " ); - // Message is very first member - buf.append( * reinterpret_cast< OUString const * >( pExc->pData ) ); - OString cstr( - OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); - OSL_FAIL( cstr.getStr() ); -#endif + SAL_WARN( + "cppu", + "exception occurred querying for interface " + << OUString(pDestType->pTypeName) << ": [" + << OUString(pExc->pType->pTypeName) << "] " + << *reinterpret_cast(pExc->pData)); + // Message is very first member uno_any_destruct( pExc, 0 ); } return ret; -- cgit