diff options
| author | Radu Ioan <ioan.radu.g@gmail.com> | 2013-02-06 00:10:23 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-02-19 16:02:40 +0000 |
| commit | ef1d096ddc311a2fd821d4076421c4a8f8d63abf (patch) | |
| tree | 5736a7b4193228c621a4a51b1dc713ec9b932ded /sal/osl | |
| parent | a09f11715be53587ee2b0368e19f45cc85fb6cf1 (diff) | |
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>
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/all/loadmodulerelative.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
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; } |