Deduplicate writer component factories.

Change-Id: I0b82e8a284f871829b7c22a654d61534b5c5a3cc

7 files changed, 18 insertions, 23 deletions

diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx
index 50bec62eaf57..7684f46cc3bd 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -15,7 +15,8 @@ const lib_to_factory_mapping *
 lo_get_factory_map(void)
 {
     static lib_to_factory_mapping map[] = {
-        NON_APP_SPECIFIC_FACTORY_MAP
+        LO_CORE_FACTORY_MAP
+        LO_WRITER_FACTORY_MAP
         { "libanimcorelo.a", animcore_component_getFactory },
         { "libavmedialo.a", avmedia_component_getFactory },
         { "libdbalo.a", dba_component_getFactory },
@@ -34,8 +35,6 @@ lo_get_factory_map(void)
         { "libsmdlo.a", smd_component_getFactory },
         { "libsmlo.a", sm_component_getFactory },
         { "libsvgfilterlo.a", svgfilter_component_getFactory },
-        { "libswdlo.a", swd_component_getFactory },
-        { "libswlo.a", sw_component_getFactory },
         { "libt602filterlo.a", t602filter_component_getFactory },
         { "libtextfdlo.a", textfd_component_getFactory },
         { "libwpftdrawlo.a", wpftdraw_component_getFactory },
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx
index 02ceaec1f121..e428f156b52f 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -15,7 +15,8 @@ const lib_to_factory_mapping *
 lo_get_factory_map(void)
 {
     static lib_to_factory_mapping map[] = {
-        NON_APP_SPECIFIC_FACTORY_MAP
+        LO_CORE_FACTORY_MAP
+        LO_WRITER_FACTORY_MAP
         { "libanimcorelo.a", animcore_component_getFactory },
         { "libavmedialo.a", avmedia_component_getFactory },
         { "libbasprov.uno.a", basprov_component_getFactory },
@@ -42,8 +43,6 @@ lo_get_factory_map(void)
         { "libstringresource.uno.a", stringresource_component_getFactory },
         { "libsvgfilterlo.a", svgfilter_component_getFactory },
         { "libsvxcorelo.a", svxcore_component_getFactory },
-        { "libswdlo.a", swd_component_getFactory },
-        { "libswlo.a", sw_component_getFactory },
         { "libt602filterlo.a", t602filter_component_getFactory },
         { "libtextfdlo.a", textfd_component_getFactory },
         { "libtklo.a", tk_component_getFactory },
@@ -52,7 +51,6 @@ lo_get_factory_map(void)
         { "libvbaevents.uno.a", vbaevents_component_getFactory },
         { "libwpftdrawlo.a", wpftdraw_component_getFactory },
         { "libwpftwriterlo.a", wpftwriter_component_getFactory },
-        { "libwriterfilterlo.a", writerfilter_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 4dbf23d6b23b..13492811844d 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -15,7 +15,8 @@ const lib_to_factory_mapping *
 lo_get_factory_map(void)
 {
     static lib_to_factory_mapping map[] = {
-        NON_APP_SPECIFIC_FACTORY_MAP
+        LO_CORE_FACTORY_MAP
+        LO_WRITER_FACTORY_MAP
         { "libanimcorelo.a", animcore_component_getFactory },
         { "libavmedialo.a", avmedia_component_getFactory },
         { "libbasprovlo.a", basprov_component_getFactory },
@@ -44,8 +45,6 @@ lo_get_factory_map(void)
         { "libstringresourcelo.a", stringresource_component_getFactory },
         { "libsvgfilterlo.a", svgfilter_component_getFactory },
         { "libsvxcorelo.a", svxcore_component_getFactory },
-        { "libswdlo.a", swd_component_getFactory },
-        { "libswlo.a", sw_component_getFactory },
         { "libt602filterlo.a", t602filter_component_getFactory },
         { "libtextfdlo.a", textfd_component_getFactory },
         { "libtklo.a", tk_component_getFactory },
@@ -55,7 +54,6 @@ lo_get_factory_map(void)
         { "libvbaeventslo.a", vbaevents_component_getFactory },
         { "libwpftdrawlo.a", wpftdraw_component_getFactory },
         { "libwpftwriterlo.a", wpftwriter_component_getFactory },
-        { "libwriterfilterlo.a", writerfilter_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 a22b86db8c00..b46964aa574f 100644
--- a/include/osl/detail/component-mapping.h
+++ b/include/osl/detail/component-mapping.h
@@ -43,7 +43,7 @@ const lib_to_constructor_mapping *lo_get_constructor_map(void);
 }
 #endif
 
-#define NON_APP_SPECIFIC_FACTORY_MAP \
+#define LO_CORE_FACTORY_MAP \
     { "libembobj.a", embobj_component_getFactory }, \
     { "libemboleobj.a", emboleobj_component_getFactory }, \
     { "libintrospectionlo.a", introspection_component_getFactory }, \
@@ -83,6 +83,11 @@ const lib_to_constructor_mapping *lo_get_constructor_map(void);
     { "libxoflo.a", xof_component_getFactory }, \
     { "libxstor.a", xstor_component_getFactory }, \
 
+#define LO_WRITER_FACTORY_MAP \
+    { "libswdlo.a", swd_component_getFactory }, \
+    { "libswlo.a", sw_component_getFactory }, \
+    { "libwriterfilterlo.a", writerfilter_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 1710c3e5a059..c8d10a34f4f2 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -21,7 +21,8 @@ const lib_to_factory_mapping *
 lo_get_factory_map(void)
 {
     static lib_to_factory_mapping map[] = {
-        NON_APP_SPECIFIC_FACTORY_MAP
+        LO_CORE_FACTORY_MAP
+        LO_WRITER_FACTORY_MAP
         { "libanalysislo.a", analysis_component_getFactory },
         { "libanimcorelo.a", animcore_component_getFactory },
         { "libavmedialo.a", avmedia_component_getFactory },
@@ -46,8 +47,6 @@ lo_get_factory_map(void)
         { "libsvgfilterlo.a", svgfilter_component_getFactory },
         { "libsvtlo.a", svt_component_getFactory },
         { "libsvxcorelo.a", svxcore_component_getFactory },
-        { "libswdlo.a", swd_component_getFactory },
-        { "libswlo.a", sw_component_getFactory },
         { "libt602filterlo.a", t602filter_component_getFactory },
         { "libtextfdlo.a", textfd_component_getFactory },
         { "libtklo.a", tk_component_getFactory },
@@ -55,7 +54,6 @@ lo_get_factory_map(void)
         { "libuuilo.a", uui_component_getFactory },
         { "libwpftdrawlo.a", wpftdraw_component_getFactory },
         { "libwpftwriterlo.a", wpftwriter_component_getFactory },
-        { "libwriterfilterlo.a", writerfilter_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 a9792791d099..b65366f4990a 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -21,7 +21,8 @@ const lib_to_factory_mapping *
 lo_get_libmap(void)
 {
     static lib_to_factory_mapping map[] = {
-        NON_APP_SPECIFIC_FACTORY_MAP
+        LO_CORE_FACTORY_MAP
+        LO_WRITER_FACTORY_MAP
         { "libanalysislo.a", analysis_component_getFactory },
         { "libanimcorelo.a", animcore_component_getFactory },
         { "libavmedialo.a", avmedia_component_getFactory },
@@ -46,8 +47,6 @@ lo_get_libmap(void)
         { "libspllo.a", spl_component_getFactory },
         { "libsvgfilterlo.a", svgfilter_component_getFactory },
         { "libsvxcorelo.a", svxcore_component_getFactory },
-        { "libswdlo.a", swd_component_getFactory },
-        { "libswlo.a", sw_component_getFactory },
         { "libt602filterlo.a", t602filter_component_getFactory },
         { "libtextfdlo.a", textfd_component_getFactory },
         { "libtklo.a", tk_component_getFactory },
@@ -55,7 +54,6 @@ lo_get_libmap(void)
         { "libuuilo.a", uui_component_getFactory },
         { "libwpftdrawlo.a", wpftdraw_component_getFactory },
         { "libwpftwriterlo.a", wpftwriter_component_getFactory },
-        { "libwriterfilterlo.a", writerfilter_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 3ab258ce6686..b72f1f7645bf 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -27,7 +27,8 @@ const lib_to_factory_mapping *
 lo_get_factory_map(void)
 {
     static lib_to_factory_mapping map[] = {
-        NON_APP_SPECIFIC_FACTORY_MAP
+        LO_CORE_FACTORY_MAP
+        LO_WRITER_FACTORY_MAP
 
         //from IOS
         
@@ -42,7 +43,6 @@ lo_get_factory_map(void)
         //MAP_LIB_LO(xmlfd),
         //MAP_LIB_LO(sc),       //MAP_LIB_LO(sd),
         //MAP_LIB(fileacc),
-        MAP_LIB_LO(swd),        MAP_LIB_LO(sw),
 
         // from ANDROID
         
@@ -53,7 +53,6 @@ lo_get_factory_map(void)
         //MAP_LIB(ucppkg1),     //MAP_LIB_LO(vbaswobj), //MAP_LIB_LO(wpftwriter),
         //MAP_LIB_LO(wpftdraw), //MAP_LIB_LO(svxcore),  //MAP_LIB_LO(protocolhandler),
         //MAP_LIB_LO_1(filterconfig), //MAP_LIB_LO(canvasfactory),    //MAP_LIB_LO(mtfrenderer),
-        MAP_LIB_LO(writerfilter),
         
         // ADDED for search