From 682c48afd989a89680a4d5ee18c8a15d10e5a58b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 15 Feb 2016 22:16:08 +0200 Subject: Just abort() in the DISABLE_DYNLOADING case for now Should fix the build for Android. Change-Id: Iabba9da8755805ad4d9d21d7a6b4b22e3fa6418f --- cppuhelper/source/servicemanager.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cppuhelper/source') diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index d89289a165a4..0c71a046b67a 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -878,6 +878,9 @@ void cppuhelper::ServiceManager::loadImplementation( void cppuhelper::ServiceManager::loadAllImplementations() { +#ifdef DISABLE_DYNLOADING + abort(); +#else rtl::OUString aUri; osl::MutexGuard g(rBHelper.rMutex); @@ -908,6 +911,7 @@ void cppuhelper::ServiceManager::loadAllImplementations() iterator->second->status = Data::Implementation::STATUS_LOADED; } } +#endif } void cppuhelper::ServiceManager::disposing() { -- cgit