mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just abort() in the DISABLE_DYNLOADING case for now

Browse Source 
Should fix the build for Android.

Change-Id: Iabba9da8755805ad4d9d21d7a6b4b22e3fa6418f
This commit is contained in:
Tor Lillqvist
2016-02-15 22:16:08 +02:00
parent 41da237dfb
commit 682c48afd9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cppuhelper/source/servicemanager.cxx
View File

@@ -878,6 +878,9 @@ void cppuhelper::ServiceManager::loadImplementation(
void cppuhelper::ServiceManager::loadAllImplementations() void cppuhelper::ServiceManager::loadAllImplementations()
{ {
#ifdef DISABLE_DYNLOADING
abort();
#else
rtl::OUString aUri; rtl::OUString aUri;
osl::MutexGuard g(rBHelper.rMutex); osl::MutexGuard g(rBHelper.rMutex);
@@ -908,6 +911,7 @@ void cppuhelper::ServiceManager::loadAllImplementations()
iterator->second->status = Data::Implementation::STATUS_LOADED; iterator->second->status = Data::Implementation::STATUS_LOADED;
} }
} }
#endif
} }
void cppuhelper::ServiceManager::disposing() { void cppuhelper::ServiceManager::disposing() {