diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:53:53 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:53:53 +0000 |
| commit | 7be85b5e8889422a33330092ce4f920737958199 (patch) | |
| tree | 235fdaf553fe3106f3d31bd9fd7ef50372eea9eb /i18npool | |
| parent | a82710c10b957075b8369162cd151caa69320b7d (diff) | |
INTEGRATION: CWS sb71 (1.15.34); FILE MERGED
2007/10/11 16:11:53 sb 1.15.34.1: osl::Module::load without path no longer works on Mac OS X.
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/collator/collator_unicode.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index b1f4e4a3cec9..ce575bd6eb53 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: collator_unicode.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2006-12-12 16:15:02 $ + * last change: $Author: vg $ $Date: 2007-10-15 12:53:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,6 +73,8 @@ Collator_Unicode::compareString( const OUString& str1, const OUString& str2) thr return collator->compare(str1.getStr(), str2.getStr()); } +extern "C" { static void SAL_CALL thisModule() {} } + sal_Int32 SAL_CALL Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::Locale& rLocale, sal_Int32 options) throw(RuntimeException) @@ -99,7 +101,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: aBuf.appendAscii(SAL_DLLPREFIX); #endif aBuf.appendAscii( "collator_data" ).appendAscii( SAL_DLLEXTENSION ); - hModule = osl_loadModule( aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT ); + hModule = osl_loadModuleRelative( &thisModule, aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT ); if (hModule) { const sal_uInt8* (*func)() = NULL; aBuf.appendAscii("get_").append(rLocale.Language).appendAscii("_"); |