diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-02-27 17:02:38 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-02-28 10:34:58 +0000 |
| commit | b5f1139427b40ca727a03e2e41aa5625cfb08bb8 (patch) | |
| tree | 9b74d675a1018e9f9f93e8c7c3aed5096e11126d /vcl/unx | |
| parent | fb23f10f191b9229fc570c4b38cfc29ca53d5ce7 (diff) | |
cleanup some module calls.
Change-Id: I2871b7e49416c1fb25b80a7a4e7e2dc98efd75d8
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/app/randrwrapper.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/xrender_peer.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx index f4fae1f3a729..d6667a608007 100644 --- a/vcl/unx/generic/app/randrwrapper.cxx +++ b/vcl/unx/generic/app/randrwrapper.cxx @@ -148,14 +148,13 @@ RandRWrapper::RandRWrapper( Display* pDisplay ) : initFromModule(); if( ! m_bValid ) { - rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libXrandr.so.2" ) ); // load and resolve dependencies immediately // rationale: there are older distributions where libXrandr.so.2 is not linked // with libXext.so, resulting in a missing symbol and terminating the office // obviously they expected libXext to be linked in global symbolspace (that is // linked by the application), which is not the case with us (because we want // to be able to run in headless mode even without an installed X11 library) - m_pRandRLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT | SAL_LOADMODULE_NOW ); + m_pRandRLib = osl_loadModule( "libXrandr.so.2", SAL_LOADMODULE_DEFAULT | SAL_LOADMODULE_NOW ); initFromModule(); } if( m_bValid ) diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx index 53855b4b15b3..75fb57f02cee 100644 --- a/vcl/unx/generic/gdi/xrender_peer.cxx +++ b/vcl/unx/generic/gdi/xrender_peer.cxx @@ -21,8 +21,6 @@ #include <stdio.h> #include <rtl/ustring.hxx> -#include <osl/module.h> - #include <unx/salunx.h> #include <unx/saldata.hxx> #include <unx/saldisp.hxx> diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index a1d8d497e0a9..4a4700a00761 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -870,9 +870,7 @@ bool CUPSManager::addOrRemovePossible() const const char* CUPSManager::authenticateUser( const char* /*pIn*/ ) { const char* pRet = NULL; - - OUString aLib(_XSALSET_LIBNAME ); - oslModule pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY ); + oslModule pLib = osl_loadModuleAscii( _XSALSET_LIBNAME, SAL_LOADMODULE_LAZY ); if( pLib ) { OUString aSym( "Sal_authenticateQuery" ); |