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

7 files changed, 58 insertions, 118 deletions

diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx
index 8c8a9bd26640..7cba3773f5e8 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -15,29 +15,14 @@ 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_CORE_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 },
-        { "libdbalo.a", dba_component_getFactory },
-        { "libdbaxmllo.a", dbaxml_component_getFactory },
-        { "libfrmlo.a", frm_component_getFactory },
-        { "libfwklo.a", fwk_component_getFactory },
-        { "libfwmlo.a", fwm_component_getFactory },
-        { "libhwplo.a", hwp_component_getFactory },
         { "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
         { "libsblo.a", sb_component_getFactory },
-        { "libsddlo.a", sdd_component_getFactory },
-        { "libsdlo.a", sd_component_getFactory },
-        { "libsmdlo.a", smd_component_getFactory },
-        { "libsmlo.a", sm_component_getFactory },
-        { "libsvgfilterlo.a", svgfilter_component_getFactory },
-        { "libt602filterlo.a", t602filter_component_getFactory },
-        { "libtextfdlo.a", textfd_component_getFactory },
-        { "libwpftdrawlo.a", wpftdraw_component_getFactory },
-        { "libwpftwriterlo.a", wpftwriter_component_getFactory },
-        { "libxmlfdlo.a", xmlfd_component_getFactory },
         { NULL, NULL }
     };
 
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx
index 7f36ce776cc3..44cb862da480 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -15,41 +15,20 @@ 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_CORE_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 },
-        { "libbasprov.uno.a", basprov_component_getFactory },
-        { "libchartcorelo.a", chartcore_component_getFactory },
-        { "libdlgprov.uno.a", dlgprov_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 },
+        { "libdlgprovlo.a", dlgprov_component_getFactory },
         { "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
         { "libscriptframe.a", scriptframe_component_getFactory },
         { "libsblo.a", sb_component_getFactory },
-        { "libsddlo.a", sdd_component_getFactory },
-        { "libsdlo.a", sd_component_getFactory },
-        { "libsmdlo.a", smd_component_getFactory },
-        { "libsmlo.a", sm_component_getFactory },
         { "libscriptframe.a", scriptframe_component_getFactory },
         { "libstringresource.uno.a", stringresource_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 },
         { "libvbaswobj.uno.a", vbaswobj_component_getFactory },
         { "libvbaevents.uno.a", vbaevents_component_getFactory },
-        { "libwpftdrawlo.a", wpftdraw_component_getFactory },
-        { "libwpftwriterlo.a", wpftwriter_component_getFactory },
-        { "libxmlfdlo.a", xmlfd_component_getFactory },
         { NULL, NULL }
     };
 
diff --git a/android/experimental/desktop/native-code.cxx b/android/experimental/desktop/native-code.cxx
index 695fec4b7e1b..6b8deab7d4c6 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -15,44 +15,24 @@ 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_CORE_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 },
         { "libbasprovlo.a", basprov_component_getFactory },
-        { "libchartcorelo.a", chartcore_component_getFactory },
         { "libdlgprovlo.a", dlgprov_component_getFactory },
-        { "libdbalo.a", dba_component_getFactory },
-        { "libdbaxmllo.a", dbaxml_component_getFactory },
         { "libcuilo.a", cui_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 },
         { "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
         { "libscriptframe.a", scriptframe_component_getFactory },
         { "libsblo.a", sb_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 },
         { "libscriptframe.a", scriptframe_component_getFactory },
         { "libstringresourcelo.a", stringresource_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 },
         { "libvbaswobjlo.a", vbaswobj_component_getFactory },
         { "libvbaeventslo.a", vbaevents_component_getFactory },
-        { "libwpftdrawlo.a", wpftdraw_component_getFactory },
-        { "libwpftwriterlo.a", wpftwriter_component_getFactory },
-        { "libxmlfdlo.a", xmlfd_component_getFactory },
         { NULL, NULL }
     };
 
diff --git a/include/osl/detail/component-mapping.h b/include/osl/detail/component-mapping.h
index 0ab4280d5ace..95625fcf9e52 100644
--- a/include/osl/detail/component-mapping.h
+++ b/include/osl/detail/component-mapping.h
@@ -83,6 +83,25 @@ const lib_to_constructor_mapping *lo_get_constructor_map(void);
     { "libxoflo.a", xof_component_getFactory }, \
     { "libxstor.a", xstor_component_getFactory }, \
 
+#define LO_EXTENDED_CORE_FACTORY_MAP \
+    LO_CORE_FACTORY_MAP \
+    { "libanimcorelo.a", animcore_component_getFactory }, \
+    { "libavmedialo.a", avmedia_component_getFactory }, \
+    { "libchartcorelo.a", chartcore_component_getFactory }, \
+    { "libfilterconfiglo.a", filterconfig1_component_getFactory }, \
+    { "libfrmlo.a", frm_component_getFactory }, \
+    { "libfwklo.a", fwk_component_getFactory }, \
+    { "libfwmlo.a", fwm_component_getFactory }, \
+    { "libsvxcorelo.a", svxcore_component_getFactory }, \
+    { "libtextfdlo.a", textfd_component_getFactory },
+    { "libtklo.a", tk_component_getFactory }, \
+    { "libucppkg1.a", ucppkg1_component_getFactory }, \
+    { "libxmlfdlo.a", xmlfd_component_getFactory }, \
+
+#define LO_BASE_CORE_FACTORY_MAP \
+    { "libdbalo.a", dba_component_getFactory }, \
+    { "libdbaxmllo.a", dbaxml_component_getFactory }, \
+
 #define LO_CALC_CORE_FACTORY_MAP \
     { "libscdlo.a", scd_component_getFactory }, \
     { "libscfiltlo.a", scfilt_component_getFactory }, \
@@ -94,11 +113,27 @@ const lib_to_constructor_mapping *lo_get_constructor_map(void);
     { "libdatelo.a", date_component_getFactory }, \
     { "libpricinglo.a", pricing_component_getFactory }, \
 
-#define LO_WRITER_FACTORY_MAP \
+#define LO_DRAW_CORE_FACTORY_MAP \
+    { "libsddlo.a", sdd_component_getFactory }, \
+    { "libsdlo.a", sd_component_getFactory }, \
+    { "libsvgfilterlo.a", svgfilter_component_getFactory }, \
+    { "libwpftdrawlo.a", wpftdraw_component_getFactory }, \
+
+#define LO_MATH_FACTORY_MAP \
+    { "libsmdlo.a", smd_component_getFactory }, \
+    { "libsmlo.a", sm_component_getFactory }, \
+
+#define LO_WRITER_CORE_FACTORY_MAP \
     { "libswdlo.a", swd_component_getFactory }, \
     { "libswlo.a", sw_component_getFactory }, \
     { "libwriterfilterlo.a", writerfilter_component_getFactory }, \
 
+#define LO_WRITER_FACTORY_MAP \
+    LO_WRITER_CORE_FACTORY_MAP \
+    { "libhwplo.a", hwp_component_getFactory }, \
+    { "libt602filterlo.a", t602filter_component_getFactory }, \
+    { "libwpftwriterlo.a", wpftwriter_component_getFactory }, \
+
 #define NON_APP_SPECIFIC_CONSTRUCTOR_MAP \
     { "com_sun_star_comp_extensions_xml_sax_ParserExpat", com_sun_star_comp_extensions_xml_sax_ParserExpat }, \
     { "com_sun_star_comp_extensions_xml_sax_FastParser", com_sun_star_comp_extensions_xml_sax_FastParser }, \
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 }