summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-07-11 17:26:59 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-07-11 17:27:23 +0200
commitd1c0a77ed1ba96b29e9b260b9ea1696634a9a094 (patch)
tree43aa14bb87e73065e3fafe4fcda332c4094d7bf1 /cppuhelper
parent19694ee33b6605e0b881392ad98eeec164ea770c (diff)
getFactory only called with nullptr "key" argument
Change-Id: I5148e1902cb3c1d2bb87b623dfd843ccadf6c430
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/shlib.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 7e334e7627ed..0cffab6783f8 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);