From a82710c10b957075b8369162cd151caa69320b7d Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Mon, 15 Oct 2007 11:53:40 +0000
Subject: INTEGRATION: CWS sb71 (1.16.4); FILE MERGED 2007/10/11 16:11:53 sb
 1.16.4.1: osl::Module::load without path no longer works on Mac OS X.

---
 i18npool/source/breakiterator/xdictionary.cxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'i18npool/source/breakiterator/xdictionary.cxx')

diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 22613bcf288d..b9925132c10a 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xdictionary.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: ihi $ $Date: 2007-08-17 14:58:36 $
+ *  last change: $Author: vg $ $Date: 2007-10-15 12:53:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -59,6 +59,8 @@ using namespace rtl;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
+extern "C" { static void SAL_CALL thisModule() {} }
+
 xdictionary::xdictionary(const sal_Char *lang)
 {
 #ifdef SAL_DLLPREFIX
@@ -68,7 +70,7 @@ xdictionary::xdictionary(const sal_Char *lang)
     OUStringBuffer aBuf( strlen(lang) + 7 + 4 );    // mostly "*.dll" (with * == dict_zh)
 #endif
     aBuf.appendAscii( "dict_" ).appendAscii( lang ).appendAscii( SAL_DLLEXTENSION );
-        hModule = osl_loadModule( aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
+        hModule = osl_loadModuleRelative( &thisModule, aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
         if( hModule ) {
             sal_IntPtr (*func)();
             func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString::createFromAscii("getExistMark").pData );
-- 
cgit