From 9faa4e46360488042d71656a5a45bed49436a49a Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 25 Oct 2012 17:16:01 +0200 Subject: comphelper: convert OSL_* to SAL_* in namedvaluecollection Mainly because it seems we hit this assert several times and right now it seems harmless. Change-Id: I9176741dd25f405c9eb49daef9c703cfde4386c4 --- comphelper/source/misc/namedvaluecollection.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'comphelper') diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 85c2883764fd..e46d40397b07 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -194,7 +194,7 @@ namespace comphelper else if ( i_rWrappedElements >>= aPropertyValue ) impl_assign( Sequence< PropertyValue >( &aPropertyValue, 1 ) ); else - OSL_ENSURE( !i_rWrappedElements.hasValue(), "NamedValueCollection::impl_assign(Any): unsupported type!" ); + SAL_WARN_IF( i_rWrappedElements.hasValue(), "comphelper", "NamedValueCollection::impl_assign(Any): unsupported type!" ); } //-------------------------------------------------------------------- @@ -222,7 +222,8 @@ namespace comphelper ::rtl::OStringBuffer message; message.append( "NamedValueCollection::impl_assign: encountered a value type which I cannot handle:\n" ); message.append( ::rtl::OUStringToOString( pArgument->getValueTypeName(), RTL_TEXTENCODING_ASCII_US ) ); - OSL_FAIL( message.getStr() ); + // Once this is rare, this could be turned into a warning. + SAL_INFO( "comphelper", message.getStr() ); } #endif } -- cgit