comphelper/source/misc/namedvaluecollection.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 9faa4e46360488042d71656a5a45bed49436a49a
Author: Miklos Vajna <vmik...@suse.cz>
Date: Thu Oct 25 17:16:01 2012 +0200
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
diff --git a/comphelper/source/misc/namedvaluecollection.cxx
b/comphelper/source/misc/namedvaluecollection.cxx
index 85c2883..e46d403 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
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
