summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-10-15 12:07:38 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-10-15 12:07:38 +0000
commita6830751337a8e5d2a68b4540fec9fe1ab04ef2a (patch)
tree5dd91c2f85b42bf9689a321604e27c739c9fe96b /vcl/unx
parente9c6ff8f19354fde00244ad266315a7de1afa1f4 (diff)
INTEGRATION: CWS sb71 (1.21.196); FILE MERGED
2007/08/23 19:03:58 sb 1.21.196.3: RESYNC: (1.22-1.23); FILE MERGED 2007/07/18 14:17:04 sb 1.21.196.2: RESYNC: (1.21-1.22); FILE MERGED 2007/06/26 13:38:41 sb 1.21.196.1: #i75466# Use new osl_loadModuleRelative to locate loaded libs next to calling lib.
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/source/plugadapt/salplug.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index 7d0fcc182db6..c709d8e5637a 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: salplug.cxx,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: rt $ $Date: 2007-07-24 10:32:48 $
+ * last change: $Author: vg $ $Date: 2007-10-15 13:07:38 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -85,7 +85,9 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
aModName.appendAscii( SAL_DLLEXTENSION );
OUString aModule = aModName.makeStringAndClear();
- oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
+ oslModule aMod = osl_loadModuleRelative(
+ reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
+ SAL_LOADMODULE_DEFAULT );
if( aMod )
{
OUString aSym( RTL_CONSTASCII_USTRINGPARAM( "create_SalInstance" ) );