fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

 - replaced osl_trace with sal_info
 - added new log areas to log-area.dox

Change-Id: Ib47c4b4c9604bca1f8a635dd01bb89702b47b591
Reviewed-on: https://gerrit.libreoffice.org/2010
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Tested-by: Thorsten Behrens <tbehrens@suse.com>

10 files changed, 95 insertions, 98 deletions

diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx
index e88367cc44f8..fa82e9e742e9 100644
--- a/extensions/source/update/check/updateprotocoltest.cxx
+++ b/extensions/source/update/check/updateprotocoltest.cxx
@@ -26,6 +26,7 @@
 #include <sal/main.h>
 #include <osl/process.h>
 #include <stdio.h>
+#include "sal/log.hxx"
 
 namespace task = ::com::sun::star::task;
 namespace uno  = ::com::sun::star::uno;
@@ -58,18 +59,16 @@ SAL_IMPLEMENT_MAIN()
     {
         if( checkForUpdates(rComponentContext, uno::Reference< task::XInteractionHandler > (), aURL, aVersion) )
         {
-            OSL_TRACE( "Update found: %s on %s",
-                rtl::OUStringToOString( aVersion, RTL_TEXTENCODING_UTF8).getStr(),
-                rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8).getStr());
+            SAL_INFO("extensions.update", "Update found: " << aVersion << " on " << aURL);
         }
         else
         {
-            OSL_TRACE( "no updates found" );
+            SAL_INFO("extensions.update", "no updates found" );
         }
     }
     catch( ... )
     {
-        OSL_TRACE( "unhandled exception caught" );
+        SAL_INFO("extensions.update", "unhandled exception caught" );
     }
 
     return 0;
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index e1422ca44fbc..378dcf5cc8f6 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -33,6 +33,7 @@ certain functionality.
 
 @li @c canvas
 @li @c canvas.cairo
+@li @c canvas.null
 
 @section connectivity
 
@@ -65,6 +66,7 @@ certain functionality.
 @li @c sd.fwk
 @li @c sd.sls
 @li @c sd.tools
+@li @c sd.ui
 @li @c sd.view
 @li @c sd.slideshow
 @li @c sdremote
@@ -165,6 +167,7 @@ certain functionality.
 @section tools
 
 @li @c tools.debug
+@li @c tools.memtools
 @li @c tools.rc - resource manager
 @li @c tools.stream - SvStream class
 
@@ -183,6 +186,10 @@ certain functionality.
 @li @c rtl.string - ::rtl::OString, ::rtl::OUString, and related functionality
 @li @c salhelper.thread - ::salhelper::Thread class
 
+@section stoc
+
+@li @c stoc.corerefl
+@li @c stoc.tdmanager
 
 @section VCL
 
@@ -220,6 +227,7 @@ certain functionality.
 @section xmlsecurity
 
 @li @c xmlsecurity.dialogs - xml security dialogs
+@li @c xmlsecurity.helper
 @li @c xmlsecurity.xmlsec - xmlsec wrapper
 
 @section other
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index 0a91169412f3..98cf1374f5c6 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -22,7 +22,7 @@
 
 #include <cstddef>
 
-#include "osl/diagnose.h"
+#include "sal/log.hxx"
 #include "osl/module.h"
 #include "osl/module.hxx"
 #include "osl/thread.h"
@@ -42,7 +42,7 @@ oslModule SAL_CALL osl_loadModuleRelative(
 {
     ::rtl::OUString base;
     if (!::osl::Module::getUrlFromAddress(baseModule, base)) {
-        OSL_TRACE("osl::Module::getUrlFromAddress failed");
+        SAL_INFO("sal.osl","osl::Module::getUrlFromAddress failed");
         return NULL;
     }
     ::rtl::OUString abs;
@@ -50,10 +50,8 @@ oslModule SAL_CALL osl_loadModuleRelative(
         abs = ::rtl::Uri::convertRelToAbs(base, relativePath);
     } catch (const ::rtl::MalformedUriException & e) {
         (void) e; // avoid warnings
-        OSL_TRACE(
-            "rtl::MalformedUriException <%s>",
-            rtl::OUStringToOString(e.getMessage(), osl_getThreadTextEncoding()).
-                getStr());
+        SAL_INFO("sal.osl",
+            "rtl::MalformedUriException <" << e.getMessage() << ">");
             //TODO: let some OSL_TRACE variant take care of text conversion?
         return NULL;
     }
diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx
index 26627f8d1742..7860092bf323 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -34,6 +34,7 @@
 
 #include "sax/tools/converter.hxx"
 #include "comphelper/sequenceasvector.hxx"
+#include "sal/log.hxx"
 
 
 using namespace ::com::sun::star;
@@ -98,15 +99,12 @@ static void doTest(util::Duration const & rid, char const*const pis,
     util::Duration od;
     ::rtl::OUString is(::rtl::OUString::createFromAscii(pis));
     bool bSuccess = Converter::convertDuration(od, is);
-    OSL_TRACE("%d %dY %dM %dD %dH %dM %dS %dm",
-        od.Negative, od.Years, od.Months, od.Days,
-        od.Hours, od.Minutes, od.Seconds, od.MilliSeconds);
+    SAL_INFO("sax.cppunit","" << od.Negative << " " << od.Years << "Y " << od.Months << "M " << od.Days << "D " << od.Hours << "H " << od.Minutes << "M " << od.Seconds << "S " << od.MilliSeconds << "m");
     CPPUNIT_ASSERT(bSuccess);
     CPPUNIT_ASSERT(eqDuration(rid, od));
     ::rtl::OUStringBuffer buf;
     Converter::convertDuration(buf, od);
-    OSL_TRACE("%s",
-        ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sax.cppunit","" << buf.getStr());
     CPPUNIT_ASSERT(buf.makeStringAndClear().equalsAscii(pos));
 }
 
@@ -115,15 +113,13 @@ static void doTestDurationF(char const*const pis)
     util::Duration od;
     bool bSuccess = Converter::convertDuration(od,
             ::rtl::OUString::createFromAscii(pis));
-    OSL_TRACE("%d %dY %dM %dD %dH %dM %dS %dH",
-        od.Negative, od.Years, od.Months, od.Days,
-        od.Hours, od.Minutes, od.Seconds, od.MilliSeconds);
+    SAL_INFO("sax.cppunit","" << od.Negative << " " << od.Years << "Y " << od.Months << "M " << od.Days << "D " << od.Hours << "H " << od.Minutes << "M " << od.Seconds << "S " << od.MilliSeconds << "H");
     CPPUNIT_ASSERT(!bSuccess);
 }
 
 void ConverterTest::testDuration()
 {
-    OSL_TRACE("\nSAX CONVERTER TEST BEGIN");
+    SAL_INFO("sax.cppunit","\nSAX CONVERTER TEST BEGIN");
     doTest( util::Duration(false, 1, 0, 0, 0, 0, 0, 0), "P1Y" );
     doTest( util::Duration(false, 0, 42, 0, 0, 0, 0, 0), "P42M" );
     doTest( util::Duration(false, 0, 0, 111, 0, 0, 0, 0), "P111D" );
@@ -151,7 +147,7 @@ void ConverterTest::testDuration()
     doTestDurationF("PT.1S");       // invalid: no 0 preceding .
     doTestDurationF("PT5M.134S");   // invalid: no 0 preceding .
     doTestDurationF("PT1.S");       // invalid: no digit following .
-    OSL_TRACE("\nSAX CONVERTER TEST END");
+    SAL_INFO("sax.cppunit","\nSAX CONVERTER TEST END");
 }
 
 
@@ -169,15 +165,12 @@ static void doTest(util::DateTime const & rdt, char const*const pis,
     ::rtl::OUString is(::rtl::OUString::createFromAscii(pis));
     util::DateTime odt;
     bool bSuccess( Converter::convertDateTime(odt, is) );
-    OSL_TRACE("Y:%d M:%d D:%d  H:%d M:%d S:%d H:%d",
-        odt.Year, odt.Month, odt.Day,
-        odt.Hours, odt.Minutes, odt.Seconds, odt.HundredthSeconds);
+    SAL_INFO("sax.cppunit","Y:" << odt.Year << " M:" << odt.Month << " D:" << odt.Day << "  H:" << odt.Hours << " M:" << odt.Minutes << " S:" << odt.Seconds << " H:" << odt.HundredthSeconds);
     CPPUNIT_ASSERT(bSuccess);
     CPPUNIT_ASSERT(eqDateTime(rdt, odt));
     ::rtl::OUStringBuffer buf;
     Converter::convertDateTime(buf, odt, true);
-    OSL_TRACE("%s",
-        ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sax.cppunit","" << buf.getStr());
     CPPUNIT_ASSERT(buf.makeStringAndClear().equalsAscii(pos));
 }
 
@@ -186,15 +179,13 @@ static void doTestDateTimeF(char const*const pis)
     util::DateTime odt;
     bool bSuccess = Converter::convertDateTime(odt,
             ::rtl::OUString::createFromAscii(pis));
-    OSL_TRACE("Y:%d M:%d D:%d  H:%dH M:%d S:%d H:%d",
-        odt.Year, odt.Month, odt.Day,
-        odt.Hours, odt.Minutes, odt.Seconds, odt.HundredthSeconds);
+    SAL_INFO("sax.cppunit","Y:" << odt.Year << " M:" << odt.Month << " D:" << odt.Day << "  H:" << odt.Hours << "H M:" << odt.Minutes << " S:" << odt.Seconds << " H:" << odt.HundredthSeconds);
     CPPUNIT_ASSERT(!bSuccess);
 }
 
 void ConverterTest::testDateTime()
 {
-    OSL_TRACE("\nSAX CONVERTER TEST BEGIN");
+    SAL_INFO("sax.cppunit","\nSAX CONVERTER TEST BEGIN");
     doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1), "0001-01-01T00:00:00" );
     doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1),
             "0001-01-01T00:00:00Z", "0001-01-01T00:00:00" );
@@ -254,7 +245,7 @@ void ConverterTest::testDateTime()
     doTestDateTimeF( "0001-01-02T00:00:00-14:01" ); // invalid: TZ < -14:00
     doTestDateTimeF( "2100-02-29T00:00:00-00:00" ); // invalid: no leap year
     doTestDateTimeF( "1900-02-29T00:00:00-00:00" ); // invalid: no leap year
-    OSL_TRACE("\nSAX CONVERTER TEST END");
+    SAL_INFO("sax.cppunit","\nSAX CONVERTER TEST END");
 }
 
 void doTestDouble(char const*const pis, double const rd,
@@ -263,13 +254,12 @@ void doTestDouble(char const*const pis, double const rd,
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     double od;
     bool bSuccess(Converter::convertDouble(od, is, nSourceUnit, nTargetUnit));
-    OSL_TRACE("%f", od);
+    SAL_INFO("sax.cppunit","" << od);
     CPPUNIT_ASSERT(bSuccess);
     CPPUNIT_ASSERT_DOUBLES_EQUAL(rd, od, 0.00000001);
     ::rtl::OUStringBuffer buf;
     Converter::convertDouble(buf, od, true, nTargetUnit, nSourceUnit);
-    OSL_TRACE("%s",
-        ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sax.cppunit","" << buf.getStr());
     CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
 }
 
@@ -330,7 +320,7 @@ void doTestStringToMeasure(sal_Int32 rValue, char const*const pis, sal_Int16 nTa
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     sal_Int32 nVal;
     bool bSuccess(Converter::convertMeasure(nVal, is, nTargetUnit, nMin, nMax));
-    OSL_TRACE("%i", nVal);
+    SAL_INFO("sax.cppunit","" << nVal);
     CPPUNIT_ASSERT(bSuccess);
     CPPUNIT_ASSERT_EQUAL(rValue, nVal);
 }
@@ -340,7 +330,7 @@ void doTestMeasureToString(char const*const pis, sal_Int32 nMeasure, sal_Int16 c
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     ::rtl::OUStringBuffer buf;
     Converter::convertMeasure(buf, nMeasure, nSourceUnit, nTargetUnit);
-    OSL_TRACE("%s", ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sax.cppunit","" << buf.getStr());
     CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
 }
 
@@ -393,7 +383,7 @@ void doTestStringToBool(bool bBool, char const*const pis)
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     bool bTemp;
     bool bSuccess(Converter::convertBool(bTemp, is));
-    OSL_TRACE("%s", bTemp);
+    SAL_INFO("sax.cppunit","" << bTemp);
     CPPUNIT_ASSERT(bSuccess);
     CPPUNIT_ASSERT_EQUAL(bBool, bTemp);
 
@@ -404,7 +394,7 @@ void doTestBoolToString(char const*const pis, bool bValue )
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     ::rtl::OUStringBuffer buf;
     Converter::convertBool(buf, bValue);
-    OSL_TRACE("%s", ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sax.cppunit","" << buf.getStr());
     CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
 }
 
@@ -421,7 +411,7 @@ void doTestStringToPercent(sal_Int32 nValue, char const*const pis)
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     sal_Int32 nTemp;
     bool bSuccess(Converter::convertPercent(nTemp, is));
-    OSL_TRACE("%i", nTemp);
+    SAL_INFO("sax.cppunit","" << nTemp);
     CPPUNIT_ASSERT(bSuccess);
     CPPUNIT_ASSERT_EQUAL(nValue, nTemp);
 }
@@ -431,7 +421,7 @@ void doTestPercentToString(char const*const pis, sal_Int32 nValue)
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     ::rtl::OUStringBuffer buf;
     Converter::convertPercent(buf, nValue);
-    OSL_TRACE("%s", ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sax.cppunit","" << buf.getStr());
     CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
 }
 
@@ -453,7 +443,7 @@ void doTestStringToColor(sal_Int32 nValue, char const*const pis)
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     sal_Int32 nTemp;
     bool bSuccess(Converter::convertColor(nTemp, is));
-    OSL_TRACE("%i", nTemp);
+    SAL_INFO("sax.cppunit","" << nTemp);
     CPPUNIT_ASSERT(bSuccess);
     CPPUNIT_ASSERT_EQUAL(nValue, nTemp);
 }
@@ -463,7 +453,7 @@ void doTestColorToString(char const*const pis, sal_Int32 nValue)
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     ::rtl::OUStringBuffer buf;
     Converter::convertColor(buf, nValue);
-    OSL_TRACE("%s", ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sax.cppunit","" << buf.getStr());
     CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
 }
 
@@ -484,7 +474,7 @@ void doTestStringToNumber(sal_Int32 nValue, char const*const pis, sal_Int32 nMin
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     sal_Int32 nTemp;
     bool bSuccess(Converter::convertNumber(nTemp, is, nMin, nMax));
-    OSL_TRACE("%i", nTemp);
+    SAL_INFO("sax.cppunit","" << nTemp);
     CPPUNIT_ASSERT(bSuccess);
     CPPUNIT_ASSERT_EQUAL(nValue, nTemp);
 }
@@ -494,7 +484,7 @@ void doTestNumberToString(char const*const pis, sal_Int32 nValue)
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     ::rtl::OUStringBuffer buf;
     Converter::convertNumber(buf, nValue);
-    OSL_TRACE("%s", ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sax.cppunit","" << buf.getStr());
     CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
 }
 
@@ -517,7 +507,7 @@ void doTestEncodeBase64(char const*const pis, const uno::Sequence<sal_Int8> aPas
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     ::rtl::OUStringBuffer buf;
     Converter::encodeBase64(buf, aPass);
-    OSL_TRACE("%s", ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sax.cppunit","" << buf.getStr());
     CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
 }
 
@@ -526,7 +516,7 @@ void doTestDecodeBase64(const uno::Sequence<sal_Int8> aPass, char const*const pi
     ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
     uno::Sequence< sal_Int8 > tempSequence;
     Converter::decodeBase64(tempSequence, is);
-    OSL_TRACE("%s", ::rtl::OUStringToOString(is.getStr(), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sax.cppunit","" << is.getStr());
     bool b = (tempSequence==aPass);
     CPPUNIT_ASSERT(b);
 }
diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx
index d1c70c5e914d..2059a86cb9ea 100644
--- a/scripting/source/provider/ScriptImpl.cxx
+++ b/scripting/source/provider/ScriptImpl.cxx
@@ -22,6 +22,7 @@
 
 #include "ScriptImpl.hxx"
 #include <util/util.hxx>
+#include "sal/log.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -40,13 +41,13 @@ throw ( RuntimeException ) :
         m_RunTimeManager( runtimeMgr, UNO_SET_THROW ),
         m_ScriptURI( scriptURI )
 {
-    OSL_TRACE( "<!constucting a ScriptImpl>" );
+    SAL_INFO("scripting.provider", "<!constucting a ScriptImpl>" );
 }
 
 //*************************************************************************
 ScriptImpl::~ScriptImpl()
 {
-    OSL_TRACE( "<Destructing a ScriptImpl>" );
+    SAL_INFO("scripting.provider", "<Destructing a ScriptImpl>" );
 }
 
 //*************************************************************************
@@ -56,7 +57,7 @@ ScriptImpl::invoke( const Sequence< Any >& aParams,
 throw ( lang::IllegalArgumentException, script::CannotConvertException,
         reflection::InvocationTargetException, RuntimeException )
 {
-    OSL_TRACE( "<ScriptImpl::invoke>" );
+    SAL_INFO("scripting.provider", "<ScriptImpl::invoke>" );
     Any result;
     Any anyScriptingContext;
 
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index ac222f8260af..60080cfe9aac 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -28,7 +28,8 @@
 
 #include <osl/file.h>
 #include <osl/thread.h>
-#include <osl/diagnose.h>
+#include "sal/log.hxx"
+
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -70,9 +71,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
             #if OSL_DEBUG_LEVEL > 1
             rtl::OUString aVal( RTL_CONSTASCII_USTRINGPARAM( "<no string>" ) );
             pAttribs[i].Value >>= aVal;
-            OSL_TRACE( "filter: Attrib: %s = %s\n",
-                       rtl::OUStringToOString( pAttribs[i].Name, RTL_TEXTENCODING_UTF8 ).getStr(),
-                       rtl::OUStringToOString( aVal, RTL_TEXTENCODING_UTF8 ).getStr() );
+            SAL_INFO("sdext.pdfimport", "filter: Attrib: " << pAttribs[i].Name << " = " << aVal << "\n");
             #endif
             if ( pAttribs[i].Name == "EmbeddedSubstream" )
                 pAttribs[i].Value >>= xSubStream;
@@ -105,7 +104,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
                 rtl::OUString aURL;
                 if( osl_createTempFile( NULL, &aFile, &aURL.pData ) == osl_File_E_None )
                 {
-                    OSL_TRACE( "created temp file %s", rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+                    SAL_INFO("sdext.pdfimport", "created temp file " << aURL);
                     const sal_Int32 nBufSize = 4096;
                     uno::Sequence<sal_Int8> aBuf(nBufSize);
                     // copy the bytes
@@ -144,7 +143,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
             aArgs[0] <<= m_xModel;
             aArgs[1] <<= xSubStream;
 
-            OSL_TRACE( "try to instantiate subfilter" );
+            SAL_INFO("sdext.pdfimport", "try to instantiate subfilter" );
             uno::Reference< document::XFilter > xSubFilter;
             try {
                 xSubFilter = uno::Reference<document::XFilter>(
@@ -157,11 +156,10 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
             catch(const uno::Exception& e)
             {
                 (void)e;
-                OSL_TRACE( "subfilter exception: %s\n",
-                           OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+                SAL_INFO("sdext.pdfimport", "subfilter exception: " << e.Message << "\n");
             }
 
-            OSL_TRACE( "subfilter: %p", xSubFilter.get() );
+            SAL_INFO("sdext.pdfimport", "subfilter: " << xSubFilter.get() );
             if( xSubFilter.is() )
             {
                 if( bAddPwdProp )
@@ -183,12 +181,12 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
         }
         #if OSL_DEBUG_LEVEL > 1
         else
-            OSL_TRACE( "PDFIAdaptor::filter: no embedded substream set" );
+            SAL_INFO("sdext.pdfimport", "PDFIAdaptor::filter: no embedded substream set" );
         #endif
     }
     #if OSL_DEBUG_LEVEL > 1
     else
-        OSL_TRACE( "PDFIAdaptor::filter: no model set" );
+        SAL_INFO("sdext.pdfimport", "PDFIAdaptor::filter: no model set" );
     #endif
 
     return bRet;
@@ -201,7 +199,7 @@ void SAL_CALL PDFIHybridAdaptor::cancel() throw()
 //XImporter
 void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException )
 {
-    OSL_TRACE( "PDFIAdaptor::setTargetDocument" );
+    SAL_INFO("sdext.pdfimport", "PDFIAdaptor::setTargetDocument" );
     m_xModel = uno::Reference< frame::XModel >( xDocument, uno::UNO_QUERY );
     if( xDocument.is() && ! m_xModel.is() )
         throw lang::IllegalArgumentException();
@@ -282,7 +280,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property
     sal_Int32 nAttribs = rSourceData.getLength();
     for( sal_Int32 i = 0; i < nAttribs; i++, pAttribs++ )
     {
-        OSL_TRACE("importer Attrib: %s", OUStringToOString( pAttribs->Name, RTL_TEXTENCODING_UTF8 ).getStr() );
+        SAL_INFO("sdext.pdfimport","importer Attrib: " << OUStringToOString( pAttribs->Name, RTL_TEXTENCODING_UTF8 ).getStr() );
         if ( pAttribs->Name == "InputStream" )
             pAttribs->Value >>= xInput;
         else if ( pAttribs->Name == "URL" )
@@ -310,7 +308,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property
 //XImporter
 void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException )
 {
-    OSL_TRACE( "PDFIAdaptor::setTargetDocument" );
+    SAL_INFO("sdext.pdfimport", "PDFIAdaptor::setTargetDocument" );
     m_xModel = uno::Reference< frame::XModel >( xDocument, uno::UNO_QUERY );
     if( xDocument.is() && ! m_xModel.is() )
         throw lang::IllegalArgumentException();
diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx
index dbd2573178d3..991fa26d5d4c 100644
--- a/stoc/source/corereflection/lrucache.hxx
+++ b/stoc/source/corereflection/lrucache.hxx
@@ -24,6 +24,7 @@
 
 #include <osl/mutex.hxx>
 #include "rtl/ustring.hxx"
+#include "sal/log.hxx"
 
 #include <boost/unordered_map.hpp>
 
@@ -156,9 +157,9 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue( const t
         CacheEntry * pEntry = (*iFind).second;
         toFront( pEntry );
 #ifdef __CACHE_DIAGNOSE
-        OSL_TRACE( "> retrieved element \"" );
-        OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
-        OSL_TRACE( "\" from cache <" );
+        SAL_INFO("stoc.corerefl", "> retrieved element \"" );
+        SAL_INFO("stoc.corerefl", "" << pEntry->aKey);
+        SAL_INFO("stoc.corerefl", "\" from cache <" );
 #endif
         return pEntry->aVal;
     }
@@ -181,9 +182,9 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
 #ifdef __CACHE_DIAGNOSE
             if (pEntry->aKey.getLength())
             {
-                OSL_TRACE( "> kicking element \"" );
-                OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
-                OSL_TRACE( "\" from cache <" );
+                SAL_INFO("stoc.corerefl", "> kicking element \"" );
+                SAL_INFO("stoc.corerefl", "" << pEntry->aKey);
+                SAL_INFO("stoc.corerefl", "\" from cache <" );
             }
 #endif
             _aKey2Element.erase( pEntry->aKey );
@@ -193,9 +194,9 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
         {
             pEntry = (*iFind).second;
 #ifdef __CACHE_DIAGNOSE
-            OSL_TRACE( "> replacing element \"" );
-            OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
-            OSL_TRACE( "\" in cache <" );
+            SAL_INFO("stoc.corerefl", "> replacing element \"" );
+            SAL_INFO("stoc.corerefl", "" << pEntry->aKey);
+            SAL_INFO("stoc.corerefl", "\" in cache <" );
 #endif
         }
         pEntry->aVal = rValue;
@@ -215,7 +216,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear()
     }
     _nCachedElements = 0;
 #ifdef __CACHE_DIAGNOSE
-    OSL_TRACE( "> cleared cache <" );
+    SAL_INFO("stoc.corerefl", "> cleared cache <" );
 #endif
 }
 
diff --git a/stoc/source/tdmanager/lrucache.hxx b/stoc/source/tdmanager/lrucache.hxx
index 4a9cdf6d57bf..b7a6895a5808 100644
--- a/stoc/source/tdmanager/lrucache.hxx
+++ b/stoc/source/tdmanager/lrucache.hxx
@@ -24,6 +24,7 @@
 
 #include <osl/mutex.hxx>
 #include "rtl/ustring.hxx"
+#include "sal/log.hxx"
 
 #include <boost/unordered_map.hpp>
 
@@ -160,9 +161,9 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue(
         CacheEntry * pEntry = (*iFind).second;
         toFront( pEntry );
 #ifdef __CACHE_DIAGNOSE
-        OSL_TRACE( "> retrieved element \"" );
-        OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
-        OSL_TRACE( "\" from cache <" );
+        SAL_INFO("stoc.tdmanager", "> retrieved element \"" );
+        SAL_INFO("stoc.tdmanager", "" << pEntry->aKey);
+        SAL_INFO("stoc.tdmanager", "\" from cache <" );
 #endif
         return pEntry->aVal;
     }
@@ -185,9 +186,9 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
 #ifdef __CACHE_DIAGNOSE
             if (pEntry->aKey.getLength())
             {
-                OSL_TRACE( "> kicking element \"" );
-                OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
-                OSL_TRACE( "\" from cache <" );
+                SAL_INFO("stoc.tdmanager", "> kicking element \"" );
+                SAL_INFO("stoc.tdmanager", "" << pEntry->aKey);
+                SAL_INFO("stoc.tdmanager", "\" from cache <" );
             }
 #endif
             _aKey2Element.erase( pEntry->aKey );
@@ -197,9 +198,9 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
         {
             pEntry = (*iFind).second;
 #ifdef __CACHE_DIAGNOSE
-            OSL_TRACE( "> replacing element \"" );
-            OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
-            OSL_TRACE( "\" in cache <" );
+            SAL_INFO("stoc.tdmanager", "> replacing element \"" );
+            SAL_INFO("stoc.tdmanager", "" << pEntry->aKey);
+            SAL_INFO("stoc.tdmanager", "\" in cache <" );
 #endif
         }
         pEntry->aVal = rValue;
@@ -218,7 +219,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear()
         _pBlock[nPos].aVal = t_Val();
     }
 #ifdef __CACHE_DIAGNOSE
-    OSL_TRACE( "> cleared cache <" );
+    SAL_INFO("stoc.tdmanager", "> cleared cache <" );
 #endif
 }
 
diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx
index 4fee6a5de3c0..fe79b471a343 100644
--- a/tools/source/memtools/mempool.cxx
+++ b/tools/source/memtools/mempool.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "tools/mempool.hxx"
-#include "osl/diagnose.h"
+#include "sal/log.hxx"
 #include "rtl/alloc.h"
 
 #include <stdio.h>
@@ -29,12 +29,12 @@ FixedMemPool::FixedMemPool(char const * pTypeName, sal_uInt16 nTypeSize)
     char name[RTL_CACHE_NAME_LENGTH + 1];
     snprintf (name, sizeof(name), "FixedMemPool_%d", (int)nTypeSize);
     m_pImpl = (FixedMemPool_Impl*)rtl_cache_create (name, nTypeSize, 0, NULL, NULL, NULL, 0, NULL, 0);
-    OSL_TRACE("FixedMemPool::ctor(\"%s\"): %p", m_pTypeName, m_pImpl);
+    SAL_INFO("tools.memtools","FixedMemPool::ctor(\"" << m_pTypeName << "\"): " << m_pImpl);
 }
 
 FixedMemPool::~FixedMemPool()
 {
-    OSL_TRACE("FixedMemPool::dtor(\"%s\"): %p", m_pTypeName, m_pImpl);
+    SAL_INFO("tools.memtools","FixedMemPool::dtor(\"" << m_pTypeName << "\"): " << m_pImpl);
     rtl_cache_destroy ((rtl_cache_type*)(m_pImpl)), m_pImpl = 0;
 }
 
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index 35e1b6cdf4b6..1b06ec843083 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/xml/crypto/sax/XReferenceCollector.hpp>
 #include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.hpp>
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
+#include <sal/log.hxx>
 
 namespace cssu = com::sun::star::uno;
 namespace cssl = com::sun::star::lang;
@@ -114,7 +115,7 @@ void XSecController::addReference( const rtl::OUString& ouUri)
 {
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::addReference: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::addReference: no signature");
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();
@@ -129,7 +130,7 @@ void XSecController::addStreamReference(
 
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::addStreamReference: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::addStreamReference: no signature");
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();
@@ -157,7 +158,7 @@ void XSecController::setReferenceCount() const
 {
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::setReferenceCount: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::setReferenceCount: no signature");
         return;
     }
     const InternalSignatureInformation &isi =
@@ -191,7 +192,7 @@ void XSecController::setX509IssuerName( rtl::OUString& ouX509IssuerName )
 {
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::setX509IssuerName: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::setX509IssuerName: no signature");
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();
@@ -202,7 +203,7 @@ void XSecController::setX509SerialNumber( rtl::OUString& ouX509SerialNumber )
 {
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::setX509SerialNumber: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::setX509SerialNumber: no signature");
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();
@@ -213,7 +214,7 @@ void XSecController::setX509Certificate( rtl::OUString& ouX509Certificate )
 {
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::setX509Certificate: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::setX509Certificate: no signature");
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();
@@ -224,7 +225,7 @@ void XSecController::setSignatureValue( rtl::OUString& ouSignatureValue )
 {
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::setSignatureValue: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::setSignatureValue: no signature");
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();
@@ -235,13 +236,13 @@ void XSecController::setDigestValue( rtl::OUString& ouDigestValue )
 {
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::setDigestValue: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::setDigestValue: no signature");
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();
     if (isi.signatureInfor.vSignatureReferenceInfors.empty())
     {
-        OSL_TRACE("XSecController::setDigestValue: no signature reference");
+        SAL_INFO("xmlsecurity.helper","XSecController::setDigestValue: no signature reference");
         return;
     }
     SignatureReferenceInformation &reference =
@@ -253,7 +254,7 @@ void XSecController::setDate( rtl::OUString& ouDate )
 {
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::setDate: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::setDate: no signature");
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();
@@ -265,7 +266,7 @@ void XSecController::setId( rtl::OUString& ouId )
 {
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::setId: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::setId: no signature");
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();
@@ -276,7 +277,7 @@ void XSecController::setPropertyId( rtl::OUString& ouPropertyId )
 {
     if (m_vInternalSignatureInformations.empty())
     {
-        OSL_TRACE("XSecController::setPropertyId: no signature");
+        SAL_INFO("xmlsecurity.helper","XSecController::setPropertyId: no signature");
         return;
     }
     InternalSignatureInformation &isi = m_vInternalSignatureInformations.back();