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>

2 files changed, 12 insertions, 6 deletions

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;
     }