vcl/generic/print/genprnpsp.cxx | 7 +++---- vcl/unx/generic/app/randrwrapper.cxx | 3 +-- vcl/unx/generic/gdi/xrender_peer.cxx | 2 -- vcl/unx/generic/printer/cupsmgr.cxx | 4 +--- vcl/win/source/gdi/salnativewidgets-luna.cxx | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-)
New commits: commit b5f1139427b40ca727a03e2e41aa5625cfb08bb8 Author: Michael Meeks <michael.me...@suse.com> Date: Wed Feb 27 17:02:38 2013 +0000 cleanup some module calls. Change-Id: I2871b7e49416c1fb25b80a7a4e7e2dc98efd75d8 diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index bbd0fc8..f01a7cf 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -103,12 +103,11 @@ static void getPaLib() #if defined( UNX ) && !( defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) ) if( ! driverLib ) { - OUString aLibName( _XSALSET_LIBNAME ); - driverLib = osl_loadModuleRelative( (oslGenericFunction)getPaLib, aLibName.pData, SAL_LOADMODULE_DEFAULT ); + driverLib = osl_loadModuleRelativeAscii( (oslGenericFunction)getPaLib, + _XSALSET_LIBNAME, + SAL_LOADMODULE_DEFAULT ); if ( !driverLib ) - { return; - } pSetupFunction = (setupFunction)osl_getAsciiFunctionSymbol( driverLib, "Sal_SetupPrinterDriver" ); if ( !pSetupFunction ) diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx index f4fae1f..d6667a6 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 53855b4..75fb57f 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 a1d8d49..4a4700a 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" ); diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 0ec6af1..4ee3f60 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -106,7 +106,7 @@ VisualStylesAPI::VisualStylesAPI() lpfnGetThemePartSize( NULL ), lpfnIsThemeActive( NULL ) { - OUString aLibraryName( RTL_CONSTASCII_USTRINGPARAM( "uxtheme.dll" ) ); + OUString aLibraryName( "uxtheme.dll" ); mhModule = osl_loadModule( aLibraryName.pData, SAL_LOADMODULE_DEFAULT ); if ( mhModule ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits