diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 18:28:28 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 18:28:28 +0000 |
| commit | 76cb1517c2f6d95b5014dee14a006c34f8adb5a6 (patch) | |
| tree | 557f180565bae9f54de1120611e312177e9207e9 /sc/source/core | |
| parent | 87cd07c943be9105eb8894e8b4cf0f7aa965d429 (diff) | |
INTEGRATION: CWS pj17 (1.32.76); FILE MERGED
2005/02/09 16:28:34 gh 1.32.76.3: do not unload used module
2005/02/07 19:00:09 pjanik 1.32.76.2: #i41132#: Do not link with libtfu, load it dynamically when needed.
2005/01/22 18:07:28 pjanik 1.32.76.1: #i41132#: Bring the caller back, update to new resmgr code.
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 09f14d6c57f5..bdb4b4cd32b9 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: interpr4.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: obo $ $Date: 2004-11-15 16:35:59 $ + * last change: $Author: hr $ $Date: 2005-02-11 19:28:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2886,8 +2886,6 @@ void ScInterpreter::ScSpewFunc() #include "sctictac.hxx" #include "scmod.hxx" -extern "C" void SAL_CALL StartInvader( Window* pParent, ResMgr* pRes); // StarWars -extern void Game(); // Froggie void ScInterpreter::ScGame() { enum GameType { @@ -3041,14 +3039,14 @@ int main() } break; case SC_GAME_STARWARS : -#if 0 -// libtfu currently not built and delivered -#ifdef SC_INVADER_GPF - if ( getenv( "SC_INVADER_GPF" ) ) -#endif - StartInvader( Application::GetDefDialogParent(), - SC_MOD()->GetResMgr()); -#endif + { + oslModule m_tfu = osl_loadModule(rtl::OUString::createFromAscii( SVLIBRARY( "tfu" ) ).pData, SAL_LOADMODULE_NOW); + typedef void StartInvader_Type (Window*, ResMgr*); + + StartInvader_Type *StartInvader = (StartInvader_Type *) osl_getSymbol( m_tfu, rtl::OUString::createFromAscii("StartInvader").pData ); + if ( StartInvader ) + StartInvader( Application::GetDefDialogParent(), ResMgr::CreateResMgr( "tfu" MAKE_NUMSTR(SUPD) )); + } break; case SC_GAME_FROGGER : //Game(); |