cppuhelper/source/shlib.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit d1c0a77ed1ba96b29e9b260b9ea1696634a9a094 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Jul 11 17:26:59 2016 +0200 getFactory only called with nullptr "key" argument Change-Id: I5148e1902cb3c1d2bb87b623dfd843ccadf6c430 diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 7e334e7..0cffab6 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -105,9 +105,8 @@ extern "C" void getFactory(va_list * args) { component_getFactoryFunc fn = va_arg(*args, component_getFactoryFunc); rtl::OString const * implementation = va_arg(*args, rtl::OString const *); void * smgr = va_arg(*args, void *); - void * key = va_arg(*args, void *); void ** factory = va_arg(*args, void **); - *factory = (*fn)(implementation->getStr(), smgr, key); + *factory = (*fn)(implementation->getStr(), smgr, nullptr); } css::uno::Reference<css::uno::XInterface> invokeComponentFactory( @@ -140,7 +139,7 @@ css::uno::Reference<css::uno::XInterface> invokeComponentFactory( serviceManager.get(), cppu::UnoType<css::lang::XMultiServiceFactory>::get()); void * factory = nullptr; - target.invoke(getFactory, function, &impl, smgr, 0, &factory); + target.invoke(getFactory, function, &impl, smgr, &factory); if (smgr != nullptr) { (*target.get()->pExtEnv->releaseInterface)( target.get()->pExtEnv, smgr); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits