fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

- changed osl_trace with sal_info

Change-Id: I6504abf50f6193db52d101ec856bcaf1ee2a982c

canvas/source/null/null_usagecounter.hxx

@@ -22,6 +22,7 @@
 
 #include <osl/interlck.h>
 #include <boost/current_function.hpp>
+#include "sal/log.hxx"
 
 namespace nullcanvas
 {
@@ -36,9 +37,7 @@ namespace nullcanvas
     public:
         UsageCounter()
         {
-            OSL_TRACE( "%s, %d objects currently in use.\n",
-                       BOOST_CURRENT_FUNCTION,
-                       osl_atomic_increment( &s_nCount ) );
+            SAL_INFO("canvas.null","" << BOOST_CURRENT_FUNCTION << ", " << osl_atomic_increment( &s_nCount ) << " objects currently in use.\n");
         }
 
         ~UsageCounter()
@@ -47,14 +46,11 @@ namespace nullcanvas
 
             if( !nCount )
             {
-                OSL_TRACE( "%s, last instance deleted.\n",
-                           BOOST_CURRENT_FUNCTION );
+                SAL_INFO("canvas.null", "" << BOOST_CURRENT_FUNCTION << ", last instance deleted.\n");
             }
             else
             {
-                OSL_TRACE( "%s, %d instances left.\n",
-                           BOOST_CURRENT_FUNCTION,
-                           nCount );
+                SAL_INFO("canvas.null", "" << BOOST_CURRENT_FUNCTION << ", " << nCount << " instances left.\n");
             }
         }
 

sd/source/ui/framework/configuration/ConfigurationTracer.cxx

@@ -21,6 +21,7 @@
 #include "ConfigurationTracer.hxx"
 
 #include <cstdio>
+#include "sal/log.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
@@ -32,16 +33,16 @@ void ConfigurationTracer::TraceConfiguration (
     const char* pMessage)
 {
 #ifdef DEBUG
-    OSL_TRACE("%s at %p {", pMessage, rxConfiguration.get());
+    SAL_INFO("sd.ui","" << pMessage << " at " << rxConfiguration.get() << " {");
     if (rxConfiguration.is())
     {
         TraceBoundResources(rxConfiguration, NULL, 0);
     }
     else
     {
-        OSL_TRACE("    empty");
+        SAL_INFO("sd.ui","    empty");
     }
-    OSL_TRACE("}");
+    SAL_INFO("sd.ui","}");
 #else
     (void)rxConfiguration;
     (void)pMessage;
@@ -65,7 +66,7 @@ void ConfigurationTracer::TraceBoundResources (
         ::rtl::OUString sLine (aResourceList[nIndex]->getResourceURL());
         for (int i=0; i<nIndentation; ++i)
             sLine = sIndentation + sLine;
-        OSL_TRACE("%s", OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_INFO("sd.ui","" << OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr());
         TraceBoundResources(rxConfiguration, aResourceList[nIndex], nIndentation+1);
     }
 }