Deduplicate more components.

No one says this is the only good classification.
Quite possibly it's not even a good one, but at least something.

Change-Id: I81178314222f9f63708a83b262ff8ef73a1d9467

3 files changed, 9 insertions, 48 deletions

diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index bf031f23160a..bfdbdc5a90b7 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -21,35 +21,16 @@ const lib_to_factory_mapping *
 lo_get_factory_map(void)
 {
     static lib_to_factory_mapping map[] = {
-        LO_CORE_FACTORY_MAP
+        LO_EXTENDED_CORE_FACTORY_MAP
+        LO_BASE_CORE_FACTORY_MAP
         LO_CALC_FACTORY_MAP
+        LO_DRAW_CORE_FACTORY_MAP
+        LO_MATH_FACTORY_MAP
         LO_WRITER_FACTORY_MAP
-        { "libanimcorelo.a", animcore_component_getFactory },
-        { "libavmedialo.a", avmedia_component_getFactory },
-        { "libchartcorelo.a", chartcore_component_getFactory },
         { "libcuilo.a", cui_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 },
-        { "libsddlo.a", sdd_component_getFactory },
-        { "libsdlo.a", sd_component_getFactory },
-        { "libsmdlo.a", smd_component_getFactory },
-        { "libsmlo.a", sm_component_getFactory },
         { "libspllo.a", spl_component_getFactory },
-        { "libsvgfilterlo.a", svgfilter_component_getFactory },
         { "libsvtlo.a", svt_component_getFactory },
-        { "libsvxcorelo.a", svxcore_component_getFactory },
-        { "libt602filterlo.a", t602filter_component_getFactory },
-        { "libtextfdlo.a", textfd_component_getFactory },
-        { "libtklo.a", tk_component_getFactory },
-        { "libucppkg1.a", ucppkg1_component_getFactory },
         { "libuuilo.a", uui_component_getFactory },
-        { "libwpftdrawlo.a", wpftdraw_component_getFactory },
-        { "libwpftwriterlo.a", wpftwriter_component_getFactory },
-        { "libxmlfdlo.a", xmlfd_component_getFactory },
         { NULL, NULL }
     };
 
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index 615227745057..0eaea4ec890b 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -21,35 +21,15 @@ const lib_to_factory_mapping *
 lo_get_factory_map(void)
 {
     static lib_to_factory_mapping map[] = {
-        LO_CORE_FACTORY_MAP
+        LO_EXTENDED_CORE_FACTORY_MAP
+        LO_BASE_CORE_FACTORY_MAP
         LO_CALC_FACTORY_MAP
+        LO_DRAW_CORE_FACTORY_MAP
+        LO_MATH_FACTORY_MAP
         LO_WRITER_FACTORY_MAP
-        { "libanimcorelo.a", animcore_component_getFactory },
-        { "libavmedialo.a", avmedia_component_getFactory },
-        { "libchartcorelo.a", chartcore_component_getFactory },
         { "libcuilo.a", cui_component_getFactory },
-        { "libdbalo.a", dba_component_getFactory },
-        { "libdbaxmllo.a", dbaxml_component_getFactory },
-        { "libfilterconfiglo.a", filterconfig1_component_getFactory },
-        { "libfrmlo.a", frm_component_getFactory },
-        { "libfwklo.a", fwk_component_getFactory },
-        { "libfwmlo.a", fwm_component_getFactory },
-        { "libhwplo.a", hwp_component_getFactory },
-        { "libsddlo.a", sdd_component_getFactory },
-        { "libsdlo.a", sd_component_getFactory },
-        { "libsmdlo.a", smd_component_getFactory },
-        { "libsmlo.a", sm_component_getFactory },
         { "libspllo.a", spl_component_getFactory },
-        { "libsvgfilterlo.a", svgfilter_component_getFactory },
-        { "libsvxcorelo.a", svxcore_component_getFactory },
-        { "libt602filterlo.a", t602filter_component_getFactory },
-        { "libtextfdlo.a", textfd_component_getFactory },
-        { "libtklo.a", tk_component_getFactory },
-        { "libucppkg1.a", ucppkg1_component_getFactory },
         { "libuuilo.a", uui_component_getFactory },
-        { "libwpftdrawlo.a", wpftdraw_component_getFactory },
-        { "libwpftwriterlo.a", wpftwriter_component_getFactory },
-        { "libxmlfdlo.a", xmlfd_component_getFactory },
         { NULL, NULL }
     };
 
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm b/ios/shared/ios_sharedlo/cxx/mlo.mm
index ab6851a6ef47..8095b2af19c1 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -28,7 +28,7 @@ lo_get_factory_map(void)
 {
     static lib_to_factory_mapping map[] = {
         LO_CORE_FACTORY_MAP
-        LO_WRITER_FACTORY_MAP
+        LO_WRITER_CORE_FACTORY_MAP
         MAP_LIB_LO(uui),
         MAP_LIB_LO(i18nsearch),
         { NULL, NULL }