diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-19 18:43:59 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-21 00:00:05 +0200 |
| commit | 128749140ffc6165f0bbbf34da3b5461c541b32f (patch) | |
| tree | 844617bcaf03e4fa27e18217490739a890354792 /stoc | |
| parent | c0ab229dc74e116760866f27b5df12e76430aef5 (diff) | |
More hacking on static linking (iOS) support
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/bootstrap/services.cxx | 4 | ||||
| -rw-r--r-- | stoc/source/loader/dllcomponentloader.cxx | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx index e92acad12494..5ddc729a794f 100644 --- a/stoc/source/bootstrap/services.cxx +++ b/stoc/source/bootstrap/services.cxx @@ -118,14 +118,14 @@ static struct ImplementationEntry g_entries[] = extern "C" { -#ifndef IOS +#ifndef DISABLE_DYNLOADING SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) { return g_moduleCount.canUnload( &g_moduleCount , pTime ); } #endif -#ifdef IOS +#ifdef DISABLE_DYNLOADING #define component_getFactory bootstrap_component_getFactory #endif diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index cd690a23e563..b2327262a472 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -229,9 +229,16 @@ sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo( throw(CannotRegisterImplementationException, RuntimeException) { +#ifdef DISABLE_DYNLOADING + (void) xKey; + (void) rLibName; + OSL_FAIL( "DllComponentLoader::writeRegistryInfo() should not be called I think?" ); + return sal_False; +#else writeSharedLibComponentInfo( expand_url( rLibName ), OUString(), m_xSMgr, xKey ); return sal_True; +#endif } } |