diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-20 12:42:48 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-09-20 12:52:15 +0300 |
| commit | 69765868e30494eb39a2b4b7566f161ef1f3db04 (patch) | |
| tree | 2aa7e54700965729ae5c890f9d8d724e282c1799 /bridges | |
| parent | 1f77f1ac177521698ee7c978f218127cb5840046 (diff) | |
DISABLE_DYNLOADING magic also for the jni_uno environment
Change-Id: I5e966a5734308381ad305b891ecfc830dc1419f6
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/jni_uno/jni_bridge.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index 87d210d300c7..f8fdbce87875 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -456,6 +456,10 @@ void SAL_CALL java_env_disposing( uno_Environment * java_env ) } } +#ifdef DISABLE_DYNLOADING +#define uno_initEnvironment java_uno_initEnvironment +#endif + //------------------------------------------------------------------------------ void SAL_CALL uno_initEnvironment( uno_Environment * java_env ) SAL_THROW_EXTERN_C() @@ -554,12 +558,17 @@ void SAL_CALL uno_ext_getMapping( } } +#ifndef DISABLE_DYNLOADING + //------------------------------------------------------------------------------ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) SAL_THROW_EXTERN_C() { return (*g_moduleCount.canUnload)( &g_moduleCount, pTime ); } + +#endif + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |