diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:12:51 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:12:51 +0000 |
commit | 10a9708c70ab0f339bbab4f20e178985e8a77c9b (patch) | |
tree | fe912c93b35f3947dba7d9fd2aaac9835f6ab557 /sc | |
parent | 7b6a7f4b2001b6f0a5c07d2c599aaa4b6560681e (diff) |
INTEGRATION: CWS sb71 (1.51.86); FILE MERGED
2007/10/12 06:42:59 sb 1.51.86.1: Make osl_loadModuleRelative work for absolute urls, too.
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/tool/interpr4.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index e98da2b90d4d..16d0e286b936 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4,9 +4,9 @@ * * $RCSfile: interpr4.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: rt $ $Date: 2007-07-06 12:35:56 $ + * last change: $Author: vg $ $Date: 2007-10-15 13:12:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2885,6 +2885,8 @@ void ScInterpreter::ScSpewFunc() #include "sctictac.hxx" #include "scmod.hxx" +extern "C" { static void SAL_CALL thisModule() {} } + void ScInterpreter::ScGame() { enum GameType { @@ -3039,7 +3041,7 @@ int main() break; case SC_GAME_STARWARS : { - oslModule m_tfu = osl_loadModule(rtl::OUString::createFromAscii( SVLIBRARY( "tfu" ) ).pData, SAL_LOADMODULE_NOW); + oslModule m_tfu = osl_loadModuleRelative(&thisModule, rtl::OUString::createFromAscii( SVLIBRARY( "tfu" ) ).pData, SAL_LOADMODULE_NOW); typedef void StartInvader_Type (Window*, ResMgr*); StartInvader_Type *StartInvader = (StartInvader_Type *) osl_getFunctionSymbol( m_tfu, rtl::OUString::createFromAscii("StartInvader").pData ); |