From 97593ae24a98daca89fad176dc2492e582b3a821 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 07:52:26 +0300 Subject: Handle lack of module loading/unloading API when DISABLE_DYNLOADING There are basicically two classes of cases: 1) Where the code is for obscure historical reasons or what I see as misguided "optimization" split into a more libraries than necessary, and these then are loaded at run-time. Instead, just use direct linking. 2) Where dynamic loading is part of the functionality offered to some upper (scripting etc) layer, or where some system-specific non-LO library is loaded dynamically, as it is not necessarily present on end-user machines. Can't have such in the DISABLE_DYNLOADING case. Change-Id: I9eceac5fb635245def2f4f3320821447bb7cd8c0 --- salhelper/source/dynload.cxx | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'salhelper') diff --git a/salhelper/source/dynload.cxx b/salhelper/source/dynload.cxx index 2e392af66ac1..f69ace831168 100644 --- a/salhelper/source/dynload.cxx +++ b/salhelper/source/dynload.cxx @@ -43,6 +43,13 @@ ORealDynamicLoader* ORealDynamicLoader::newInstance(ORealDynamicLoader ** ppSetT const rtl::OUString& moduleName, const rtl::OUString& initFunction) { +#ifdef DISABLE_DYNLOADING + (void) ppSetToZeroInDestructor; + (void) moduleName; + (void) initFunction; + + return NULL; +#else ApiInitFunction initFunc; oslModule pModule = osl_loadModule(moduleName.pData, SAL_LOADMODULE_DEFAULT); @@ -64,6 +71,7 @@ ORealDynamicLoader* ORealDynamicLoader::newInstance(ORealDynamicLoader ** ppSetT initFunction, initFunc(), pModule)); +#endif } ORealDynamicLoader::~ORealDynamicLoader() @@ -74,7 +82,9 @@ ORealDynamicLoader::~ORealDynamicLoader() if (m_pModule) { +#ifndef DISABLE_DYNLOADING osl_unloadModule(m_pModule); +#endif m_pModule = NULL; } } -- cgit v1.2.3