[Libreoffice-commits] core.git: connectivity/source

Stephan Bergmann sbergman at redhat.com
Tue Jul 29 07:13:13 PDT 2014


 connectivity/source/manager/mregistration.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit dea278910731ddd8856fa122d59d83e01bdff87f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 29 16:12:33 2014 +0200

    Fix *_component_getFactory function type
    
    Change-Id: I827fd727eb49ce19da847327d78bca531a11bc1a

diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index 45eff18..ec11e69 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -34,7 +34,7 @@ extern "C"
 {
 
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbc2_component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbc2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/)
 {
     void* pRet = NULL;
 
@@ -42,7 +42,8 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbc2_component_getFactory(const sal_Char* _
     {
         Reference< XSingleServiceFactory > xFactory(
             ::cppu::createOneInstanceFactory(
-                _pServiceManager,
+                static_cast<css::lang::XMultiServiceFactory *>(
+                    _pServiceManager),
                 ::drivermanager::OSDBCDriverManager::getImplementationName_static(),
                 ::drivermanager::OSDBCDriverManager::Create,
                 ::drivermanager::OSDBCDriverManager::getSupportedServiceNames_static()


More information about the Libreoffice-commits mailing list