cppuhelper/source/servicemanager.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 682c48afd989a89680a4d5ee18c8a15d10e5a58b
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Feb 15 22:16:08 2016 +0200
Just abort() in the DISABLE_DYNLOADING case for now
Should fix the build for Android.
Change-Id: Iabba9da8755805ad4d9d21d7a6b4b22e3fa6418f
diff --git a/cppuhelper/source/servicemanager.cxx
b/cppuhelper/source/servicemanager.cxx
index d89289a..0c71a04 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() {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
