diff options
6 files changed, 16 insertions, 21 deletions
diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx index 7684f46cc3bd..8c8a9bd26640 100644 --- a/android/experimental/DocumentLoader/native-code.cxx +++ b/android/experimental/DocumentLoader/native-code.cxx @@ -16,6 +16,7 @@ lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { LO_CORE_FACTORY_MAP + LO_CALC_CORE_FACTORY_MAP LO_WRITER_FACTORY_MAP { "libanimcorelo.a", animcore_component_getFactory }, { "libavmedialo.a", avmedia_component_getFactory }, @@ -26,10 +27,7 @@ lo_get_factory_map(void) { "libfwmlo.a", fwm_component_getFactory }, { "libhwplo.a", hwp_component_getFactory }, { "libprotocolhandlerlo.a", protocolhandler_component_getFactory }, - { "libscdlo.a", scd_component_getFactory }, - { "libscfiltlo.a", scfilt_component_getFactory }, { "libsblo.a", sb_component_getFactory }, - { "libsclo.a", sc_component_getFactory }, { "libsddlo.a", sdd_component_getFactory }, { "libsdlo.a", sd_component_getFactory }, { "libsmdlo.a", smd_component_getFactory }, diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx index e428f156b52f..7f36ce776cc3 100644 --- a/android/experimental/LibreOffice4Android/native-code.cxx +++ b/android/experimental/LibreOffice4Android/native-code.cxx @@ -16,6 +16,7 @@ lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { LO_CORE_FACTORY_MAP + LO_CALC_CORE_FACTORY_MAP LO_WRITER_FACTORY_MAP { "libanimcorelo.a", animcore_component_getFactory }, { "libavmedialo.a", avmedia_component_getFactory }, @@ -30,11 +31,8 @@ lo_get_factory_map(void) { "libfwmlo.a", fwm_component_getFactory }, { "libhwplo.a", hwp_component_getFactory }, { "libprotocolhandlerlo.a", protocolhandler_component_getFactory }, - { "libscdlo.a", scd_component_getFactory }, - { "libscfiltlo.a", scfilt_component_getFactory }, { "libscriptframe.a", scriptframe_component_getFactory }, { "libsblo.a", sb_component_getFactory }, - { "libsclo.a", sc_component_getFactory }, { "libsddlo.a", sdd_component_getFactory }, { "libsdlo.a", sd_component_getFactory }, { "libsmdlo.a", smd_component_getFactory }, diff --git a/android/experimental/desktop/native-code.cxx b/android/experimental/desktop/native-code.cxx index 13492811844d..695fec4b7e1b 100644 --- a/android/experimental/desktop/native-code.cxx +++ b/android/experimental/desktop/native-code.cxx @@ -16,6 +16,7 @@ lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { LO_CORE_FACTORY_MAP + LO_CALC_CORE_FACTORY_MAP LO_WRITER_FACTORY_MAP { "libanimcorelo.a", animcore_component_getFactory }, { "libavmedialo.a", avmedia_component_getFactory }, @@ -31,11 +32,8 @@ lo_get_factory_map(void) { "libfwmlo.a", fwm_component_getFactory }, { "libhwplo.a", hwp_component_getFactory }, { "libprotocolhandlerlo.a", protocolhandler_component_getFactory }, - { "libscdlo.a", scd_component_getFactory }, - { "libscfiltlo.a", scfilt_component_getFactory }, { "libscriptframe.a", scriptframe_component_getFactory }, { "libsblo.a", sb_component_getFactory }, - { "libsclo.a", sc_component_getFactory }, { "libsddlo.a", sdd_component_getFactory }, { "libsdlo.a", sd_component_getFactory }, { "libsmdlo.a", smd_component_getFactory }, diff --git a/include/osl/detail/component-mapping.h b/include/osl/detail/component-mapping.h index b46964aa574f..0ab4280d5ace 100644 --- a/include/osl/detail/component-mapping.h +++ b/include/osl/detail/component-mapping.h @@ -83,6 +83,17 @@ const lib_to_constructor_mapping *lo_get_constructor_map(void); { "libxoflo.a", xof_component_getFactory }, \ { "libxstor.a", xstor_component_getFactory }, \ +#define LO_CALC_CORE_FACTORY_MAP \ + { "libscdlo.a", scd_component_getFactory }, \ + { "libscfiltlo.a", scfilt_component_getFactory }, \ + { "libsclo.a", sc_component_getFactory }, \ + +#define LO_CALC_FACTORY_MAP \ + LO_CALC_CORE_FACTORY_MAP \ + { "libanalysislo.a", analysis_component_getFactory }, \ + { "libdatelo.a", date_component_getFactory }, \ + { "libpricinglo.a", pricing_component_getFactory }, \ + #define LO_WRITER_FACTORY_MAP \ { "libswdlo.a", swd_component_getFactory }, \ { "libswlo.a", sw_component_getFactory }, \ diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm index c8d10a34f4f2..bf031f23160a 100644 --- a/ios/experimental/LibreOffice/LibreOffice/lo.mm +++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm @@ -22,23 +22,18 @@ lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { LO_CORE_FACTORY_MAP + LO_CALC_FACTORY_MAP LO_WRITER_FACTORY_MAP - { "libanalysislo.a", analysis_component_getFactory }, { "libanimcorelo.a", animcore_component_getFactory }, { "libavmedialo.a", avmedia_component_getFactory }, { "libchartcorelo.a", chartcore_component_getFactory }, { "libcuilo.a", cui_component_getFactory }, - { "libdatelo.a", date_component_getFactory }, { "libdbalo.a", dba_component_getFactory }, { "libdbaxmllo.a", dbaxml_component_getFactory }, { "libfilterconfiglo.a", filterconfig1_component_getFactory }, { "libfrmlo.a", frm_component_getFactory }, { "libfwmlo.a", fwm_component_getFactory }, { "libhwplo.a", hwp_component_getFactory }, - { "libpricinglo.a", pricing_component_getFactory }, - { "libscdlo.a", scd_component_getFactory }, - { "libscfiltlo.a", scfilt_component_getFactory }, - { "libsclo.a", sc_component_getFactory }, { "libsddlo.a", sdd_component_getFactory }, { "libsdlo.a", sd_component_getFactory }, { "libsmdlo.a", smd_component_getFactory }, diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm index b65366f4990a..fcbf7c539cc4 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm @@ -22,13 +22,12 @@ lo_get_libmap(void) { static lib_to_factory_mapping map[] = { LO_CORE_FACTORY_MAP + LO_CALC_FACTORY_MAP LO_WRITER_FACTORY_MAP - { "libanalysislo.a", analysis_component_getFactory }, { "libanimcorelo.a", animcore_component_getFactory }, { "libavmedialo.a", avmedia_component_getFactory }, { "libchartcorelo.a", chartcore_component_getFactory }, { "libcuilo.a", cui_component_getFactory }, - { "libdatelo.a", date_component_getFactory }, { "libdbalo.a", dba_component_getFactory }, { "libdbaxmllo.a", dbaxml_component_getFactory }, { "libfilterconfiglo.a", filterconfig1_component_getFactory }, @@ -36,10 +35,6 @@ lo_get_libmap(void) { "libfwklo.a", fwk_component_getFactory }, { "libfwmlo.a", fwm_component_getFactory }, { "libhwplo.a", hwp_component_getFactory }, - { "libpricinglo.a", pricing_component_getFactory }, - { "libscdlo.a", scd_component_getFactory }, - { "libscfiltlo.a", scfilt_component_getFactory }, - { "libsclo.a", sc_component_getFactory }, { "libsddlo.a", sdd_component_getFactory }, { "libsdlo.a", sd_component_getFactory }, { "libsmdlo.a", smd_component_getFactory }, |