Deduplicate some foo_component_getFactory declarations.

Change-Id: I9304b62134bab375b721399ae078bf66e01191d8

android/experimental/DocumentLoader/native-code.cxx

@@ -9,48 +9,6 @@
 
 #include "osl/detail/android-bootstrap.h"
 
-extern "C"
-{
-    extern void * animcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * avmedia_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * dba_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * dbaxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * frm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fsstorage_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * hwp_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * protocolhandler_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sb_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * scd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sdd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * smd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * spell_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svgfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * swd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * t602filter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * textfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * unordf_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * wpftdraw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * wpftwriter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xmlfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xmlsecurity_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xo_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xof_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-}
-
 extern "C"
 __attribute__ ((visibility("default")))
 const lib_to_component_mapping *

android/experimental/LibreOffice4Android/native-code.cxx

@@ -9,65 +9,6 @@
 
 #include "osl/detail/android-bootstrap.h"
 
-extern "C"
-{
-    extern void * animcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * avmedia_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * basprov_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * chartcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * dba_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * dbaxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * dlgprov_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * embobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * emboleobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * filterconfig1_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * frm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fsstorage_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * hwp_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * protocolhandler_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sb_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * scd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * scriptframe_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sot_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svx_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svxcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sdd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * smd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * spell_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * stringresource_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svgfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * swd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * t602filter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * textfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * tk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * ucppkg1_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * unordf_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * vbaswobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * vbaevents_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * wpftdraw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * wpftwriter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * writerfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xmlfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xmlsecurity_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xo_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xof_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-}
-
 extern "C"
 __attribute__ ((visibility("default")))
 const lib_to_component_mapping *

android/experimental/desktop/native-code.cxx

@@ -9,69 +9,6 @@
 
 #include "osl/detail/android-bootstrap.h"
 
-extern "C"
-{
-    extern void * animcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * avmedia_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * cui_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * basprov_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * chartcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * dba_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * dbaxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * dlgprov_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * embobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * emboleobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * filterconfig1_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * frm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fsstorage_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * hwp_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * protocolhandler_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sb_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * scd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * scriptframe_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sot_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svx_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svxcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sdd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * smd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * spl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * spell_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * stringresource_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svgfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svx_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * swd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * t602filter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * textfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * tk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * ucppkg1_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * unordf_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * uui_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * vbaswobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * vbaevents_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * wpftdraw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * wpftwriter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * writerfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xmlfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xmlsecurity_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xo_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xof_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-}
-
 extern "C"
 __attribute__ ((visibility("default")))
 const lib_to_component_mapping *

cppuhelper/source/shlib.cxx

@@ -238,37 +238,6 @@ Reference< XInterface > invokeComponentFactory(
 
 } // namespace
 
-#ifdef DISABLE_DYNLOADING
-extern "C"
-{
-    extern void * bootstrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * configmgr_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * comphelp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * deployment_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * filterconfig1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwk_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * introspection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * localebe1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * package2_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * reflection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sfx_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * tk_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * stocservices_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * i18npool_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * ucb_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * ucpexpand1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * ucpfile_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * utl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * vcl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xstor_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-
-    extern void * com_sun_star_comp_extensions_xml_sax_ParserExpat_component_getFactory( const char * , void * , void * );
-    extern void * com_sun_star_extensions_xml_sax_Writer_component_getFactory( const char * , void * , void * );
-    extern void * com_sun_star_comp_extensions_xml_sax_FastParser_component_getFactory( const char * , void * , void * );
-}
-#endif
-
 namespace cppuhelper { namespace detail {
 
 css::uno::Reference<css::uno::XInterface> loadSharedLibComponentFactory(

include/osl/detail/component-declarations.h

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_OSL_DETAIL_COMPONENT_DECLARATIONS_H
+#define INCLUDED_OSL_DETAIL_COMPONENT_DECLARATIONS_H
+
+#ifdef DISABLE_DYNLOADING
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void * analysis_component_getFactory( const char * , void * , void * );
+void * animcore_component_getFactory( const char * , void * , void * );
+void * avmedia_component_getFactory( const char * , void * , void * );
+void * basprov_component_getFactory( const char * , void * , void * );
+void * bootstrap_component_getFactory( const char * , void * , void * );
+void * chartcore_component_getFactory( const char * , void * , void * );
+void * comphelp_component_getFactory( const char * , void * , void * );
+void * configmgr_component_getFactory( const char * , void * , void * );
+void * cui_component_getFactory( const char * , void * , void * );
+void * date_component_getFactory( const char * , void * , void * );
+void * dba_component_getFactory( const char * , void * , void * );
+void * dbaxml_component_getFactory( const char * , void * , void * );
+void * deployment_component_getFactory( const char * , void * , void * );
+void * dlgprov_component_getFactory( const char * , void * , void * );
+void * embobj_component_getFactory( const char * , void * , void * );
+void * emboleobj_component_getFactory( const char * , void * , void * );
+void * evtatt_component_getFactory( const char * , void * , void * );
+void * filterconfig1_component_getFactory( const char * , void * , void * );
+void * frm_component_getFactory( const char * , void * , void * );
+void * fsstorage_component_getFactory( const char * , void * , void * );
+void * fwk_component_getFactory( const char * , void * , void * );
+void * fwl_component_getFactory( const char * , void * , void * );
+void * fwm_component_getFactory( const char * , void * , void * );
+void * hwp_component_getFactory( const char * , void * , void * );
+void * hyphen_component_getFactory( const char * , void * , void * );
+void * i18npool_component_getFactory( const char * , void * , void * );
+void * i18nsearch_component_getFactory( const char * , void * , void * );
+void * introspection_component_getFactory( const char * , void * , void * );
+void * lng_component_getFactory( const char * , void * , void * );
+void * lnth_component_getFactory( const char * , void * , void * );
+void * localebe1_component_getFactory( const char * , void * , void * );
+void * oox_component_getFactory( const char * , void * , void * );
+void * package2_component_getFactory( const char * , void * , void * );
+void * pricing_component_getFactory( const char * , void * , void * );
+void * protocolhandler_component_getFactory( const char * , void * , void * );
+void * reflection_component_getFactory( const char * , void * , void * );
+void * sb_component_getFactory( const char * , void * , void * );
+void * sc_component_getFactory( const char * , void * , void * );
+void * scd_component_getFactory( const char * , void * , void * );
+void * scfilt_component_getFactory( const char * , void * , void * );
+void * scriptframe_component_getFactory( const char * , void * , void * );
+void * sd_component_getFactory( const char * , void * , void * );
+void * sdd_component_getFactory( const char * , void * , void * );
+void * sfx_component_getFactory( const char * , void * , void * );
+void * sm_component_getFactory( const char * , void * , void * );
+void * smd_component_getFactory( const char * , void * , void * );
+void * sot_component_getFactory( const char * , void * , void * );
+void * spell_component_getFactory( const char * , void * , void * );
+void * spl_component_getFactory( const char * , void * , void * );
+void * stocservices_component_getFactory( const char * , void * , void * );
+void * stringresource_component_getFactory( const char * , void * , void * );
+void * svgfilter_component_getFactory( const char * , void * , void * );
+void * svl_component_getFactory( const char * , void * , void * );
+void * svt_component_getFactory( const char * , void * , void * );
+void * svx_component_getFactory( const char * , void * , void * );
+void * svxcore_component_getFactory( const char * , void * , void * );
+void * sw_component_getFactory( const char * , void * , void * );
+void * swd_component_getFactory( const char * , void * , void * );
+void * t602filter_component_getFactory( const char * , void * , void * );
+void * textfd_component_getFactory( const char * , void * , void * );
+void * tk_component_getFactory( const char * , void * , void * );
+void * ucb_component_getFactory( const char * , void * , void * );
+void * ucpexpand1_component_getFactory( const char * , void * , void * );
+void * ucpfile_component_getFactory( const char * , void * , void * );
+void * ucppkg1_component_getFactory( const char * , void * , void * );
+void * unordf_component_getFactory( const char * , void * , void * );
+void * unoxml_component_getFactory( const char * , void * , void * );
+void * utl_component_getFactory( const char * , void * , void * );
+void * uui_component_getFactory( const char * , void * , void * );
+void * vbaevents_component_getFactory( const char * , void * , void * );
+void * vbaswobj_component_getFactory( const char * , void * , void * );
+void * vcl_component_getFactory( const char * , void * , void * );
+void * wpftdraw_component_getFactory( const char * , void * , void * );
+void * wpftwriter_component_getFactory( const char * , void * , void * );
+void * writerfilter_component_getFactory( const char * , void * , void * );
+void * xmlfd_component_getFactory( const char * , void * , void * );
+void * xmlsecurity_component_getFactory( const char * , void * , void * );
+void * xo_component_getFactory( const char * , void * , void * );
+void * xof_component_getFactory( const char * , void * , void * );
+void * xstor_component_getFactory( const char * , void * , void * );
+
+void * com_sun_star_comp_extensions_xml_sax_FastParser_component_getFactory( const char * , void * , void * );
+void * com_sun_star_comp_extensions_xml_sax_ParserExpat_component_getFactory( const char * , void * , void * );
+void * com_sun_star_extensions_xml_sax_Writer_component_getFactory( const char * , void * , void * );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* DISABLE_DYNLOADING */
+
+#endif // INCLUDED_OSL_DETAIL_COMPONENT_DECLARATIONS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/osl/detail/component-mapping.h

@@ -10,6 +10,8 @@
 #ifndef INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
 #define INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
 
+#include <osl/detail/component-declarations.h>
+
 #ifdef DISABLE_DYNLOADING
 
 #ifdef __cplusplus

ios/experimental/LibreOffice/LibreOffice/lo.mm

@@ -16,63 +16,6 @@
 #include <osl/process.h>
 #include <touch/touch.h>
 
-extern "C" {
-    extern void * analysis_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * animcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * avmedia_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * chartcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * cui_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * date_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * dba_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * dbaxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * embobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * emboleobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * filterconfig1_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * frm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fsstorage_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fwm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * hwp_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * pricing_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * scd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sdd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * smd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sot_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * spell_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * spl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svgfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svx_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * svxcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * swd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * t602filter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * textfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * tk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * ucppkg1_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * unordf_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * uui_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * wpftdraw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * wpftwriter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * writerfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xmlfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xmlsecurity_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xo_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * xof_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-
-}
-
 extern "C"
 const lib_to_component_mapping *
 lo_get_libmap(void)

ios/shared/ios_sharedlo/cxx/mlo.mm

@@ -18,106 +18,10 @@
 #undef TimeValue
 #include <osl/process.h>
 
-#define ADD_LIB(LIB) extern void * LIB##_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey )
 #define MAP_LIB(LIB) { "lib" #LIB ".a", LIB##_component_getFactory }
 #define MAP_LIB_LO(LIB) { "lib" #LIB "lo.a", LIB##_component_getFactory }
 #define MAP_LIB_LO_1(LIB) { "lib" #LIB "lo.a", LIB##1_component_getFactory }
 
-extern "C" {
-    
-    //from iOS
-    
-    //ADD_LIB(analysis);        // Exotic calc functionality 
-    //ADD_LIB(animcore);        // animation support lib
-    //ADD_LIB(avmedia);         // video support lib *
-    //ADD_LIB(dba);             // dbaccess lib
-    //ADD_LIB(date);            // Extra calc functionallty
-
-    //ADD_LIB(dbaxml);          // dbaccess lib
-    ADD_LIB(evtatt);            // basic event handling
-    //ADD_LIB(fileacc);           // Simple file access func
-    //ADD_LIB(frm);             // form control in documents
-    ADD_LIB(fsstorage);         // part of svl required when editing file
-    ADD_LIB(stocservices);
-    ADD_LIB(reflection);
-    
-    //ADD_LIB(fwk);             // framework toolbars, menu etc. * (Loaded by shlib.cxx)
-    ADD_LIB(fwl);               // framework toolbars, menu etc. needed for select all (Creating XDispatchHelper)
-    //ADD_LIB(fwm);             // framework toolbars, menu etc.
-    //ADD_LIB(hwp);             // Korean Hangul Word Processor file format support
-    
-    ADD_LIB(hyphen);          // Hunspell - spell checker external lib
-    ADD_LIB(lng);               // Linguistic
-    ADD_LIB(lnth);              // Linguistic
-    ADD_LIB(oox);               // Word open XML func
-    
-    //ADD_LIB(pricing);         // Calc pricing func
-    //ADD_LIB(sc);              // Spreadsheet code
-    //ADD_LIB(scd);             // Spreadsheet code
-    //ADD_LIB(scfilt);          // Spreadsheet code
-    
-    //ADD_LIB(sd);              // Impress draw
-    //ADD_LIB(sdd);             // Impress Draw
-    //ADD_LIB(sm);              // Furmula editor code for writer
-    //ADD_LIB(smd);             // Furmula editor code for writer
-    
-    ADD_LIB(spell);           // Spelling
-    //ADD_LIB(svgfilter);       // svg vector graphic filter
-    ADD_LIB(svt);               // used for displaying images in writer
-    ADD_LIB(svx);
-    
-    ADD_LIB(sw);                // wirter code
-    ADD_LIB(swd);               // writer code
-    //ADD_LIB(t602filter);      // Graphic filters (russian notes)
-    //ADD_LIB(textfd);          // Filter
-    //ADD_LIB(xmlfd);           // Filter
-    //ADD_LIB(filterconfig1);   // Filter *
-    
-    ADD_LIB(unoxml);            // UNO wrappers for XML services.
-    ADD_LIB(unordf);            // UNO wrappers for XML services.
-    ADD_LIB(uui);             // Interction handler for vcl
-    ADD_LIB(xmlsecurity);     // Stuff for document signing.
-    
-    ADD_LIB(xo);                // odf filter writer stop working need to fix
-    ADD_LIB(xof);               // odf filter writer stop working need to fix
-    
-    // from ANDROID
-    
-    //ADD_LIB(cui);             // extra dialogs *
-    //ADD_LIB(basprov);         // Basic scripting
-    //ADD_LIB(chartcore);       // Chart implementation for LibreOffice Calc.
-    //ADD_LIB(dlgprov);         // Code for embedding objects into LibreOffice
-    
-    ADD_LIB(embobj);            // needed for embeded objects
-    ADD_LIB(emboleobj);         // needed for embeded objects
-    ADD_LIB(expwrap);           // Wrapper around expat using UNO.
-    //ADD_LIB(protocolhandler); // Scripting 
-    
-    //ADD_LIB(sb);              // StarBasic * (tied to writer)
-    //ADD_LIB(scriptframe);
-    ADD_LIB(sot);             // Compound file storage tools code. *
-    //ADD_LIB(svxcore);         // Contains graphics related helper code *
-    //ADD_LIB(spl);             // Basic LibreOffice code *
-    
-    //ADD_LIB(stringresource);
-    //ADD_LIB(tk);              // "Abstract" windowing thing, UNO implementations windowing stuff *
-    //ADD_LIB(ucppkg1);         // Content broker (conversion master)
-    //ADD_LIB(vbaswobj);        // vba writer support
-    //ADD_LIB(vbaevents);       // scripting support
-    
-    //ADD_LIB(wpftdraw);        // Wordperfect filter
-    //ADD_LIB(wpftwriter);      // Wordperfect filter
-
-    ADD_LIB(writerfilter);      // Import filter for doc, docx, rtf
-    //ADD_LIB(canvasfactory);   // UNO-based graphics backend
-    //ADD_LIB(vclcanvas);       // UNO-based graphics backend
-    //ADD_LIB(mtfrenderer);     // canvas helper
-   
-    // ADDED for search
-    
-    ADD_LIB(i18nsearch);
-}
-
 extern "C"
 const lib_to_component_mapping *
 lo_get_libmap(void)