Drop unused comphelper::service_decl::component_getFactoryHelper params

Change-Id: Ia47c0bc3539ddf8f925cd053a2431c742c46d337

desktop/source/deployment/dp_services.cxx

@@ -72,14 +72,10 @@ extern sdecl::ServiceDecl const serviceDecl;
 extern "C" {
 
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL deployment_component_getFactory(
-    sal_Char const * pImplName,
+    sal_Char const * pImplName, void *, void *)
-    void * pServiceManager,
-    void * pRegistryKey )
 {
     return component_getFactoryHelper(
         pImplName,
-        static_cast<css::lang::XMultiServiceFactory *>(pServiceManager),
-        static_cast<css::registry::XRegistryKey *>(pRegistryKey),
         dp_registry::backend::configuration::serviceDecl,
         dp_registry::backend::component::serviceDecl,
         dp_registry::backend::help::serviceDecl,

desktop/source/deployment/gui/dp_gui_service.cxx

@@ -330,12 +330,10 @@ sdecl::ServiceDecl const updateDecl(
 extern "C" {
 
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL deploymentgui_component_getFactory(
-    sal_Char const * pImplName,
+    sal_Char const * pImplName, void *, void *)
-    void * pServiceManager,
-    void * pRegistryKey )
 {
     return component_getFactoryHelper(
-        pImplName, static_cast<css::lang::XMultiServiceFactory *>(pServiceManager), static_cast<css::registry::XRegistryKey *>(pRegistryKey), dp_gui::serviceDecl, dp_gui::licenseDecl, dp_gui::updateDecl );
+        pImplName, dp_gui::serviceDecl, dp_gui::licenseDecl, dp_gui::updateDecl );
 }
 
 } // extern "C"

extensions/source/resource/resourceservices.cxx

@@ -30,11 +30,9 @@ const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl(
     "com.sun.star.resource.OfficeResourceLoader");
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL res_component_getFactory(
-    sal_Char const* pImplName,
+    sal_Char const* pImplName, void*, void*)
-    ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
-    ::com::sun::star::registry::XRegistryKey* pRegistryKey )
 {
-    return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey,
+    return component_getFactoryHelper( pImplName,
             ResourceIndexAccessDecl, OpenOfficeResourceLoaderDecl );
 }
 

filter/source/graphic/Services.cxx

@@ -38,17 +38,15 @@ const comphelper::service_decl::ServiceDecl graphicExportDialog(
 
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL graphicfilter_component_getFactory(
-    sal_Char const* pImplementationName,
+    sal_Char const* pImplementationName, void*, void*)
-    ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
-    ::com::sun::star::registry::XRegistryKey* pRegistryKey )
 {
     if ( rtl_str_compare (pImplementationName, GRAPHIC_EXPORT_FILTER_SERVICE) == 0 )
     {
-        return component_getFactoryHelper( pImplementationName, pServiceManager, pRegistryKey, graphicExportFilter );
+        return component_getFactoryHelper( pImplementationName, graphicExportFilter );
     }
     else if ( rtl_str_compare (pImplementationName, GRAPHIC_EXPORT_DIALOG_SERVICE) == 0 )
     {
-        return component_getFactoryHelper( pImplementationName, pServiceManager, pRegistryKey, graphicExportDialog );
+        return component_getFactoryHelper( pImplementationName, graphicExportDialog );
     }
     return NULL;
 }

filter/source/svg/svgfilter.cxx

@@ -408,17 +408,15 @@ namespace sdecl = comphelper::service_decl;
 
 // The C shared lib entry points
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL svgfilter_component_getFactory(
-    sal_Char const* pImplName,
+    sal_Char const* pImplName, void*, void*)
-    ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
-    ::com::sun::star::registry::XRegistryKey* pRegistryKey )
 {
     if ( rtl_str_compare (pImplName, SVG_FILTER_IMPL_NAME) == 0 )
     {
-        return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, svgFilter );
+        return component_getFactoryHelper( pImplName, svgFilter );
     }
     else if ( rtl_str_compare (pImplName, SVG_WRITER_IMPL_NAME) == 0 )
     {
-        return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, svgWriter );
+        return component_getFactoryHelper( pImplName, svgWriter );
     }
     return NULL;
 }

include/comphelper/servicedecl.hxx

@@ -23,8 +23,6 @@
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <uno/environment.h>
 #include <boost/utility.hpp>
 #include <boost/function.hpp>
@@ -313,8 +311,6 @@ struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT
     <pre>
         inline void * component_getFactoryHelper(
             sal_Char const* pImplName,
-            ::com::sun::star::lang::XMultiServiceFactory *,
-            ::com::sun::star::registry::XRegistryKey * xRegistryKey,
             ServiceDecl const& s0, ServiceDecl const& s1, ... );
     </pre>
 
@@ -326,8 +322,6 @@ struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT
 #define COMPHELPER_SERVICEDECL_make(z_, n_, unused_) \
 inline void * component_getFactoryHelper( \
     sal_Char const* pImplName, \
-    ::com::sun::star::lang::XMultiServiceFactory *, \
-    ::com::sun::star::registry::XRegistryKey *, \
     BOOST_PP_ENUM_PARAMS(n_, ServiceDecl const& s) ) \
 { \
     void * pRet = 0; \
@@ -379,11 +373,9 @@ 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, \
-                                         void*   pServiceManager, \
+                                         void*, void* ) \
-                                         void*       pRegistryKey ) \
     { \
-        return component_getFactoryHelper( pImplName, static_cast<css::lang::XMultiServiceFactory *>(pServiceManager), \
+        return component_getFactoryHelper( pImplName, \
-                                           static_cast<css::registry::XRegistryKey *>(pRegistryKey), \
                                            BOOST_PP_SEQ_ENUM(varargs_) ); \
     } \
 }

sc/source/ui/vba/service.cxx

@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <cppuhelper/implementationentry.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <comphelper/servicedecl.hxx>
 
 // component exports
@@ -57,11 +55,10 @@ extern sdecl::ServiceDecl const serviceDecl;
 extern "C"
 {
     SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaobj_component_getFactory(
-        const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
+        const sal_Char * pImplName, void *, void *)
-        registry::XRegistryKey * pRegistryKey )
     {
     void* pRet =  component_getFactoryHelper(
-            pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl );
+            pImplName, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl );
     return pRet;
     }
 }

sw/source/ui/vba/service.cxx

@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <cppuhelper/implementationentry.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <osl/diagnose.h>
 #include <comphelper/servicedecl.hxx>
 
@@ -52,12 +50,9 @@ extern sdecl::ServiceDecl const serviceDecl;
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaswobj_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager,
+    const sal_Char * pImplName, void *, void *)
-    void * pRegistryKey )
 {
     void* pRet = component_getFactoryHelper(pImplName,
-            static_cast<css::lang::XMultiServiceFactory *>(pServiceManager),
-            static_cast<css::registry::XRegistryKey *>(pRegistryKey),
             globals::serviceDecl, ::document::serviceDecl,
             wrapformat::serviceDecl, vbaeventshelper::serviceDecl );
     OSL_TRACE("Ret is 0x%p", pRet);

vbahelper/source/msforms/service.cxx

@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "cppuhelper/implementationentry.hxx"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/registry/XRegistryKey.hpp"
 #include "comphelper/servicedecl.hxx"
 
 
@@ -43,12 +41,11 @@ extern sdecl::ServiceDecl const serviceDecl;
 extern "C"
 {
     SAL_DLLPUBLIC_EXPORT void * SAL_CALL msforms_component_getFactory(
-        const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
+        const sal_Char * pImplName, void *, void *)
-        registry::XRegistryKey * pRegistryKey )
     {
         SAL_INFO("vbahelper", "In component_getFactory for " << pImplName );
     void* pRet =  component_getFactoryHelper(
-            pImplName, pServiceManager, pRegistryKey, controlprovider::serviceDecl, userform::serviceDecl );
+            pImplName, controlprovider::serviceDecl, userform::serviceDecl );
     SAL_INFO("vbahelper", "Ret is 0x" << std::hex << pRet);
     return pRet;
     }