[Libreoffice-commits] .: comphelper/source

[Libreoffice Gerrit user]

 comphelper/source/misc/namedvaluecollection.cxx |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 489a0032f4dd6b1cd8b5e2e7c70b1ea626bee0d9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 26 10:54:38 2012 +0200

    Simplify SAL_INFO usage even further
    
    Change-Id: I452319aa627c8de17e87033597a151f186c4361c

diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index e46d403..70f0796 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -33,9 +33,7 @@
 #include <com/sun/star/beans/PropertyState.hpp>
 
 #include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
 #include <rtl/instance.hxx>
-#include <osl/diagnose.h>
 
 #include <boost/unordered_map.hpp>
 #include <functional>
@@ -216,16 +214,15 @@ namespace comphelper
                 m_pImpl->aValues[ aPropertyValue.Name ] = aPropertyValue.Value;
             else if ( *pArgument >>= aNamedValue )
                 m_pImpl->aValues[ aNamedValue.Name ] = aNamedValue.Value;
-#if OSL_DEBUG_LEVEL > 0
-            else if ( pArgument->hasValue() )
+            else
             {
-                ::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 ) );
                 // Once this is rare, this could be turned into a warning.
-                SAL_INFO( "comphelper", message.getStr() );
+                SAL_INFO_IF(
+                    pArgument->hasValue(), "comphelper",
+                    ("NamedValueCollection::impl_assign: encountered a value"
+                     " type which I cannot handle: "
+                     + pArgument->getValueTypeName()));
             }
-#endif
         }
     }