mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb71 (1.28.4); FILE MERGED

Browse Source 
2007/06/20 12:49:01 sb 1.28.4.1: #i75466# Unlike Solaris and Linux, Mac OS X dlopen does not search for file next to the library calling dlopen if file does not contain slashes (you have to prefix file with "@loader_path/" for that to work on Mac OS X); refactored accordingly.
This commit is contained in:
Vladimir Glazounov
2007-10-15 11:19:40 +00:00
parent 1bd20f0743
commit 593ba0941f
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cppu/source/uno/lbmap.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: lbmap.cxx,v $
*
* $Revision: 1.28 $
* $Revision: 1.29 $
*
* last change: $Author: kz $ $Date: 2007-05-09 13:39:24 $
* last change: $Author: vg $ $Date: 2007-10-15 12:19:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -60,7 +60,7 @@
#include "cppu/EnvDcp.hxx"
#include "cascade_mapping.hxx"
#include "IdentityMapping.hxx"
#include "loadmodule.hxx"
using namespace std;
using namespace osl;
@@ -373,16 +373,7 @@ static inline oslModule loadModule( const OUString & rBridgeName )
if (! bNeg)
{
OUStringBuffer aLibName( rBridgeName.getLength() + 12 );
#if defined SAL_DLLPREFIX
aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX) );
#endif
aLibName.append( rBridgeName );
aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLEXTENSION) );
OUString aModule( aLibName.makeStringAndClear() );
oslModule hModule = ::osl_loadModule(
aModule.pData, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
oslModule hModule = cppu::detail::loadModule( rBridgeName );
if (hModule)
return hModule;