[Libreoffice-commits] core.git: include/comphelper

Stephan Bergmann sbergman at redhat.com
Fri Aug 8 04:55:43 PDT 2014


 include/comphelper/servicedecl.hxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0465a063b99c50c04dcd7616c17a5d946053c7de
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 8 13:25:23 2014 +0200

    Fix *_component_getFactory function type
    
    Change-Id: I91b18d4a96d10070fb9e7be76ea39b07541fa4db

diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index 436bb74..499bcbc 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -378,11 +378,11 @@ BOOST_PP_REPEAT_FROM_TO(1, COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS,
 extern "C" \
 { \
     SAL_DLLPUBLIC_EXPORT void* SAL_CALL compName##_component_getFactory( sal_Char const* pImplName, \
-                                         ::com::sun::star::lang::XMultiServiceFactory*   pServiceManager, \
-                                         ::com::sun::star::registry::XRegistryKey*       pRegistryKey ) \
+                                         void*   pServiceManager, \
+                                         void*       pRegistryKey ) \
     { \
-        return component_getFactoryHelper( pImplName, pServiceManager, \
-                                           pRegistryKey, \
+        return component_getFactoryHelper( pImplName, static_cast<css::lang::XMultiServiceFactory *>(pServiceManager), \
+                                           static_cast<css::registry::XRegistryKey *>(pRegistryKey), \
                                            BOOST_PP_SEQ_ENUM(varargs_) ); \
     } \
 }


More information about the Libreoffice-commits mailing list