Seems more natural to pass a homogenous list by initializer_list

...than by template parameter pack (even if that requires using ServiceDecl*, as
initializer_list cannot take reference types)

Change-Id: Ia986201b52d8daedfe925f132ebc79bc2c0ba378

2 files changed, 15 insertions, 14 deletions

diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index 82b633b61206..b20a2667f146 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -73,18 +73,18 @@ extern "C" {
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL deployment_component_getFactory(
     sal_Char const * pImplName, void *, void *)
 {
-    return component_getFactoryHelper(
+    return sdecl::component_getFactoryHelper(
         pImplName,
-        dp_registry::backend::configuration::serviceDecl,
-        dp_registry::backend::component::serviceDecl,
-        dp_registry::backend::help::serviceDecl,
-        dp_registry::backend::script::serviceDecl,
-        dp_registry::backend::sfwk::serviceDecl,
-        dp_registry::backend::executable::serviceDecl,
-        dp_manager::factory::serviceDecl,
-        dp_log::serviceDecl,
-        dp_info::serviceDecl,
-        dp_manager::serviceDecl);
+        {&dp_registry::backend::configuration::serviceDecl,
+         &dp_registry::backend::component::serviceDecl,
+         &dp_registry::backend::help::serviceDecl,
+         &dp_registry::backend::script::serviceDecl,
+         &dp_registry::backend::sfwk::serviceDecl,
+         &dp_registry::backend::executable::serviceDecl,
+         &dp_manager::factory::serviceDecl,
+         &dp_log::serviceDecl,
+         &dp_info::serviceDecl,
+         &dp_manager::serviceDecl});
 }
 
 } // extern "C"
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index e60e0017def1..60686a6d9060 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -45,6 +45,7 @@ using namespace ::dp_misc;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+namespace sdecl = comphelper::service_decl;
 
 namespace dp_gui {
 
@@ -303,7 +304,6 @@ void ServiceImpl::trigger( OUString const &rEvent ) throw (RuntimeException, std
     startExecuteModal( Reference< ui::dialogs::XDialogClosedListener >() );
 }
 
-namespace sdecl = comphelper::service_decl;
 sdecl::class_<ServiceImpl, sdecl::with_args<true> > serviceSI;
 sdecl::ServiceDecl const serviceDecl(
     serviceSI,
@@ -328,8 +328,9 @@ extern "C" {
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL deploymentgui_component_getFactory(
     sal_Char const * pImplName, void *, void *)
 {
-    return component_getFactoryHelper(
-        pImplName, dp_gui::serviceDecl, dp_gui::licenseDecl, dp_gui::updateDecl );
+    return sdecl::component_getFactoryHelper(
+        pImplName,
+        {&dp_gui::serviceDecl, &dp_gui::licenseDecl, &dp_gui::updateDecl});
 }
 
 } // extern "C"