diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:17:30 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:17:30 +0000 |
| commit | 3f3f6cca61f0f6672a769d30c75a78b9ea2b3861 (patch) | |
| tree | 1a77806dac147fd1ee60fece8d9bced7d51aed57 /sfx2/source/appl | |
| parent | 6921500961728156513053c92751180d83f2e3f4 (diff) | |
INTEGRATION: CWS sb71 (1.61.76); FILE MERGED
2007/10/12 07:52:45 sb 1.61.76.1: #i75466# osl_loadModule without path no longer works on Mac OS X.
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/appinit.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 0605a7838115..0667597d9792 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appinit.cxx,v $ * - * $Revision: 1.62 $ + * $Revision: 1.63 $ * - * last change: $Author: kz $ $Date: 2007-10-09 15:31:22 $ + * last change: $Author: vg $ $Date: 2007-10-15 13:17:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -252,6 +252,8 @@ typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const Font& i_ // a library above us. //==================================================================== +extern "C" { static void SAL_CALL thisModule() {} } + String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) { static bool bDetermineFunction = false; @@ -266,7 +268,8 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "svx" ) ) ); rtl::OUString aLibName( sLibName ); - oslModule handleMod = osl_loadModule( aLibName.pData, 0 ); + oslModule handleMod = osl_loadModuleRelative( + &thisModule, aLibName.pData, 0 ); // get symbol ::rtl::OUString aSymbol( RTL_CONSTASCII_USTRINGPARAM( "GetSpecialCharsForEdit" ) ); |