[Libreoffice-commits] core.git: connectivity/source
Stephan Bergmann
sbergman at redhat.com
Thu Jul 10 02:11:45 PDT 2014
connectivity/source/cpool/Zregistration.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit d16bb62d226ede68899f14a2c037158d94c61620
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Jul 10 11:11:00 2014 +0200
Fix function signature
Change-Id: Ia3cd228009792d2e5c2e3b74e740341bb0088867
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index c10ce44..8367c97 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -34,7 +34,7 @@ extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/)
{
void* pRet = NULL;
@@ -42,7 +42,8 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const sal_Char*
{
Reference< XSingleServiceFactory > xFactory(
::cppu::createOneInstanceFactory(
- _pServiceManager,
+ static_cast<css::lang::XMultiServiceFactory *>(
+ _pServiceManager),
OPoolCollection::getImplementationName_Static(),
OPoolCollection::CreateInstance,
OPoolCollection::getSupportedServiceNames_Static()
More information about the Libreoffice-commits
mailing list