diff options
| author | Arnaud Versini <arnaud.versini@libreoffice.org> | 2013-09-22 14:08:53 +0200 |
|---|---|---|
| committer | Arnaud Versini <arnaud.versini@libreoffice.org> | 2013-09-28 16:37:39 +0000 |
| commit | 164b6ce7b27c0a9ec19019e7b078b9f8f382007d (patch) | |
| tree | b6e497b0a14a5f5d40d1316a87334aa129f88aac /sal/osl/all | |
| parent | 9fb9b057d65b07fcd037b31505561c5b3fe9939c (diff) | |
General cleanup in sal module for all and unix.
Remove useless comments and header, and de duplicate a small declaration.
Change-Id: I0d4475cbbd61ea964f8e586cf0e1f68eb91c4948
Reviewed-on: https://gerrit.libreoffice.org/6016
Reviewed-by: Arnaud Versini <arnaud.versini@libreoffice.org>
Tested-by: Arnaud Versini <arnaud.versini@libreoffice.org>
Diffstat (limited to 'sal/osl/all')
| -rw-r--r-- | sal/osl/all/debugbase.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/all/loadmodulerelative.cxx | 13 | ||||
| -rw-r--r-- | sal/osl/all/utility.cxx | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index c70a0dc7b690..d92d92dd9b09 100644 --- a/sal/osl/all/debugbase.cxx +++ b/sal/osl/all/debugbase.cxx @@ -66,7 +66,7 @@ inline bool isSubStr( char const* pStr, rtl::OString const& subStr ) return rtl_str_indexOfStr( pStr, subStr.getStr() ) >= 0; } -struct DebugBaseMutex : ::rtl::Static<osl::Mutex, DebugBaseMutex> {}; +struct DebugBaseMutex : rtl::Static<osl::Mutex, DebugBaseMutex> {}; } // anon namespace diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx index 98cf1374f5c6..2e77690ebf13 100644 --- a/sal/osl/all/loadmodulerelative.cxx +++ b/sal/osl/all/loadmodulerelative.cxx @@ -25,7 +25,6 @@ #include "sal/log.hxx" #include "osl/module.h" #include "osl/module.hxx" -#include "osl/thread.h" #include "rtl/malformeduriexception.hxx" #include "rtl/uri.hxx" #include "rtl/ustring.h" @@ -40,22 +39,22 @@ oslModule SAL_CALL osl_loadModuleRelative( oslGenericFunction const baseModule, rtl_uString * const relativePath, sal_Int32 const mode) { - ::rtl::OUString base; - if (!::osl::Module::getUrlFromAddress(baseModule, base)) { + rtl::OUString base; + if (!osl::Module::getUrlFromAddress(baseModule, base)) { SAL_INFO("sal.osl","osl::Module::getUrlFromAddress failed"); return NULL; } - ::rtl::OUString abs; + rtl::OUString abs; try { - abs = ::rtl::Uri::convertRelToAbs(base, relativePath); - } catch (const ::rtl::MalformedUriException & e) { + abs = rtl::Uri::convertRelToAbs(base, relativePath); + } catch (const rtl::MalformedUriException & e) { (void) e; // avoid warnings SAL_INFO("sal.osl", "rtl::MalformedUriException <" << e.getMessage() << ">"); //TODO: let some OSL_TRACE variant take care of text conversion? return NULL; } - return ::osl_loadModule(abs.pData, mode); + return osl_loadModule(abs.pData, mode); } #endif // !DISABLE_DYNLOADING diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx index 4c0aff71a6dd..adafdbbdc4f4 100644 --- a/sal/osl/all/utility.cxx +++ b/sal/osl/all/utility.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "rtl/ustring.hxx" #include "osl/time.h" -#include <stdio.h> /* |