android/experimental/DocumentLoader/native-code.cxx | 13 ----------
android/experimental/LibreOffice4Android/native-code.cxx | 18 ---------------
android/experimental/desktop/native-code.cxx | 18 ---------------
include/osl/detail/component-mapping.h | 18 +++++++++++++++
ios/experimental/LibreOffice/LibreOffice/lo.mm | 18 ---------------
ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm | 18 ---------------
ios/shared/ios_sharedlo/cxx/mlo.mm | 12 +---------
7 files changed, 20 insertions(+), 95 deletions(-)
New commits:
commit ad4e451070bc3aa2d1c6c4c582d66d5cb34bec59
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Wed Dec 18 17:54:33 2013 +0100
Deduplicate a lot of common components.
Change-Id: Ic3eb95119eed7a691c9cd0c677f28c87395b9415
diff --git a/android/experimental/DocumentLoader/native-code.cxx
b/android/experimental/DocumentLoader/native-code.cxx
index 2eb7cce..50bec62 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -20,17 +20,10 @@ lo_get_factory_map(void)
{ "libavmedialo.a", avmedia_component_getFactory },
{ "libdbalo.a", dba_component_getFactory },
{ "libdbaxmllo.a", dbaxml_component_getFactory },
- { "libevtattlo.a", evtatt_component_getFactory },
{ "libfrmlo.a", frm_component_getFactory },
- { "libfsstoragelo.a", fsstorage_component_getFactory },
{ "libfwklo.a", fwk_component_getFactory },
- { "libfwllo.a", fwl_component_getFactory },
{ "libfwmlo.a", fwm_component_getFactory },
{ "libhwplo.a", hwp_component_getFactory },
- { "libhyphenlo.a", hyphen_component_getFactory },
- { "liblnglo.a", lng_component_getFactory },
- { "liblnthlo.a", lnth_component_getFactory },
- { "libooxlo.a", oox_component_getFactory },
{ "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
{ "libscdlo.a", scd_component_getFactory },
{ "libscfiltlo.a", scfilt_component_getFactory },
@@ -40,20 +33,14 @@ lo_get_factory_map(void)
{ "libsdlo.a", sd_component_getFactory },
{ "libsmdlo.a", smd_component_getFactory },
{ "libsmlo.a", sm_component_getFactory },
- { "libspelllo.a", spell_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 },
- { "libunordflo.a", unordf_component_getFactory },
- { "libunoxmllo.a", unoxml_component_getFactory },
{ "libwpftdrawlo.a", wpftdraw_component_getFactory },
{ "libwpftwriterlo.a", wpftwriter_component_getFactory },
{ "libxmlfdlo.a", xmlfd_component_getFactory },
- { "libxmlsecurity.a", xmlsecurity_component_getFactory },
- { "libxoflo.a", xof_component_getFactory },
- { "libxolo.a", xo_component_getFactory },
{ NULL, NULL }
};
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx
b/android/experimental/LibreOffice4Android/native-code.cxx
index 747e816..02ceaec 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -23,20 +23,11 @@ lo_get_factory_map(void)
{ "libdlgprov.uno.a", dlgprov_component_getFactory },
{ "libdbalo.a", dba_component_getFactory },
{ "libdbaxmllo.a", dbaxml_component_getFactory },
- { "libembobj.a", embobj_component_getFactory },
- { "libemboleobj.a", emboleobj_component_getFactory },
- { "libevtattlo.a", evtatt_component_getFactory },
{ "libfilterconfiglo.a", filterconfig1_component_getFactory },
{ "libfrmlo.a", frm_component_getFactory },
- { "libfsstoragelo.a", fsstorage_component_getFactory },
{ "libfwklo.a", fwk_component_getFactory },
- { "libfwllo.a", fwl_component_getFactory },
{ "libfwmlo.a", fwm_component_getFactory },
{ "libhwplo.a", hwp_component_getFactory },
- { "libhyphenlo.a", hyphen_component_getFactory },
- { "liblnglo.a", lng_component_getFactory },
- { "liblnthlo.a", lnth_component_getFactory },
- { "libooxlo.a", oox_component_getFactory },
{ "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
{ "libscdlo.a", scd_component_getFactory },
{ "libscfiltlo.a", scfilt_component_getFactory },
@@ -47,13 +38,9 @@ lo_get_factory_map(void)
{ "libsdlo.a", sd_component_getFactory },
{ "libsmdlo.a", smd_component_getFactory },
{ "libsmlo.a", sm_component_getFactory },
- { "libsotlo.a", sot_component_getFactory },
- { "libspelllo.a", spell_component_getFactory },
{ "libscriptframe.a", scriptframe_component_getFactory },
{ "libstringresource.uno.a", stringresource_component_getFactory },
{ "libsvgfilterlo.a", svgfilter_component_getFactory },
- { "libsvtlo.a", svt_component_getFactory },
- { "libsvxlo.a", svx_component_getFactory },
{ "libsvxcorelo.a", svxcore_component_getFactory },
{ "libswdlo.a", swd_component_getFactory },
{ "libswlo.a", sw_component_getFactory },
@@ -61,17 +48,12 @@ lo_get_factory_map(void)
{ "libtextfdlo.a", textfd_component_getFactory },
{ "libtklo.a", tk_component_getFactory },
{ "libucppkg1.a", ucppkg1_component_getFactory },
- { "libunordflo.a", unordf_component_getFactory },
- { "libunoxmllo.a", unoxml_component_getFactory },
{ "libvbaswobj.uno.a", vbaswobj_component_getFactory },
{ "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 },
- { "libxmlsecurity.a", xmlsecurity_component_getFactory },
- { "libxoflo.a", xof_component_getFactory },
- { "libxolo.a", xo_component_getFactory },
{ NULL, NULL }
};
diff --git a/android/experimental/desktop/native-code.cxx
b/android/experimental/desktop/native-code.cxx
index 3e44f52..4dbf23d 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -24,20 +24,11 @@ lo_get_factory_map(void)
{ "libdbalo.a", dba_component_getFactory },
{ "libdbaxmllo.a", dbaxml_component_getFactory },
{ "libcuilo.a", cui_component_getFactory },
- { "libembobj.a", embobj_component_getFactory },
- { "libemboleobj.a", emboleobj_component_getFactory },
- { "libevtattlo.a", evtatt_component_getFactory },
{ "libfilterconfiglo.a", filterconfig1_component_getFactory },
{ "libfrmlo.a", frm_component_getFactory },
- { "libfsstoragelo.a", fsstorage_component_getFactory },
{ "libfwklo.a", fwk_component_getFactory },
- { "libfwllo.a", fwl_component_getFactory },
{ "libfwmlo.a", fwm_component_getFactory },
{ "libhwplo.a", hwp_component_getFactory },
- { "libhyphenlo.a", hyphen_component_getFactory },
- { "liblnglo.a", lng_component_getFactory },
- { "liblnthlo.a", lnth_component_getFactory },
- { "libooxlo.a", oox_component_getFactory },
{ "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
{ "libscdlo.a", scd_component_getFactory },
{ "libscfiltlo.a", scfilt_component_getFactory },
@@ -49,13 +40,9 @@ lo_get_factory_map(void)
{ "libsmdlo.a", smd_component_getFactory },
{ "libsmlo.a", sm_component_getFactory },
{ "libspllo.a", spl_component_getFactory },
- { "libsotlo.a", sot_component_getFactory },
- { "libspelllo.a", spell_component_getFactory },
{ "libscriptframe.a", scriptframe_component_getFactory },
{ "libstringresourcelo.a", stringresource_component_getFactory },
{ "libsvgfilterlo.a", svgfilter_component_getFactory },
- { "libsvtlo.a", svt_component_getFactory },
- { "libsvxlo.a", svx_component_getFactory },
{ "libsvxcorelo.a", svxcore_component_getFactory },
{ "libswdlo.a", swd_component_getFactory },
{ "libswlo.a", sw_component_getFactory },
@@ -63,8 +50,6 @@ lo_get_factory_map(void)
{ "libtextfdlo.a", textfd_component_getFactory },
{ "libtklo.a", tk_component_getFactory },
{ "libucppkg1.a", ucppkg1_component_getFactory },
- { "libunordflo.a", unordf_component_getFactory },
- { "libunoxmllo.a", unoxml_component_getFactory },
{ "libuuilo.a", uui_component_getFactory },
{ "libvbaswobjlo.a", vbaswobj_component_getFactory },
{ "libvbaeventslo.a", vbaevents_component_getFactory },
@@ -72,9 +57,6 @@ lo_get_factory_map(void)
{ "libwpftwriterlo.a", wpftwriter_component_getFactory },
{ "libwriterfilterlo.a", writerfilter_component_getFactory },
{ "libxmlfdlo.a", xmlfd_component_getFactory },
- { "libxmlsecurity.a", xmlsecurity_component_getFactory },
- { "libxoflo.a", xof_component_getFactory },
- { "libxolo.a", xo_component_getFactory },
{ NULL, NULL }
};
diff --git a/include/osl/detail/component-mapping.h
b/include/osl/detail/component-mapping.h
index df00726..a22b86d 100644
--- a/include/osl/detail/component-mapping.h
+++ b/include/osl/detail/component-mapping.h
@@ -44,25 +44,43 @@ const lib_to_constructor_mapping
*lo_get_constructor_map(void);
#endif
#define NON_APP_SPECIFIC_FACTORY_MAP \
+ { "libembobj.a", embobj_component_getFactory }, \
+ { "libemboleobj.a", emboleobj_component_getFactory }, \
{ "libintrospectionlo.a", introspection_component_getFactory }, \
{ "libreflectionlo.a", reflection_component_getFactory }, \
{ "libstocserviceslo.a", stocservices_component_getFactory }, \
{ "libcomphelper.a", comphelp_component_getFactory }, \
{ "libconfigmgrlo.a", configmgr_component_getFactory }, \
{ "libdeployment.a", deployment_component_getFactory }, \
+ { "libevtattlo.a", evtatt_component_getFactory }, \
{ "libfilterconfiglo.a", filterconfig1_component_getFactory }, \
+ { "libfsstoragelo.a", fsstorage_component_getFactory }, \
{ "libfwklo.a", fwk_component_getFactory }, \
+ { "libfwllo.a", fwl_component_getFactory }, \
+ { "libhyphenlo.a", hyphen_component_getFactory }, \
{ "libi18npoollo.a", i18npool_component_getFactory }, \
+ { "liblnglo.a", lng_component_getFactory }, \
+ { "liblnthlo.a", lnth_component_getFactory }, \
{ "liblocalebe1lo.a", localebe1_component_getFactory }, \
+ { "libooxlo.a", oox_component_getFactory }, \
{ "libpackage2.a", package2_component_getFactory }, \
{ "libsfxlo.a", sfx_component_getFactory }, \
+ { "libsotlo.a", sot_component_getFactory }, \
+ { "libspelllo.a", spell_component_getFactory }, \
{ "libsvllo.a", svl_component_getFactory }, \
+ { "libsvtlo.a", svt_component_getFactory }, \
+ { "libsvxlo.a", svx_component_getFactory }, \
{ "libtklo.a", tk_component_getFactory }, \
{ "libucb1.a", ucb_component_getFactory }, \
{ "libucpexpand1lo.a", ucpexpand1_component_getFactory }, \
{ "libucpfile1.a", ucpfile_component_getFactory }, \
+ { "libunordflo.a", unordf_component_getFactory }, \
+ { "libunoxmllo.a", unoxml_component_getFactory }, \
{ "libutllo.a", utl_component_getFactory }, \
{ "libvcllo.a", vcl_component_getFactory }, \
+ { "libxmlsecurity.a", xmlsecurity_component_getFactory }, \
+ { "libxolo.a", xo_component_getFactory }, \
+ { "libxoflo.a", xof_component_getFactory }, \
{ "libxstor.a", xstor_component_getFactory }, \
#define NON_APP_SPECIFIC_CONSTRUCTOR_MAP \
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm
b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index bce3874..1710c3e 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -30,20 +30,10 @@ lo_get_factory_map(void)
{ "libdatelo.a", date_component_getFactory },
{ "libdbalo.a", dba_component_getFactory },
{ "libdbaxmllo.a", dbaxml_component_getFactory },
- { "libembobj.a", embobj_component_getFactory },
- { "libemboleobj.a", emboleobj_component_getFactory },
- { "libevtattlo.a", evtatt_component_getFactory },
{ "libfilterconfiglo.a", filterconfig1_component_getFactory },
{ "libfrmlo.a", frm_component_getFactory },
- { "libfsstoragelo.a", fsstorage_component_getFactory },
- { "libfwklo.a", fwk_component_getFactory },
- { "libfwllo.a", fwl_component_getFactory },
{ "libfwmlo.a", fwm_component_getFactory },
{ "libhwplo.a", hwp_component_getFactory },
- { "libhyphenlo.a", hyphen_component_getFactory },
- { "liblnglo.a", lng_component_getFactory },
- { "liblnthlo.a", lnth_component_getFactory },
- { "libooxlo.a", oox_component_getFactory },
{ "libpricinglo.a", pricing_component_getFactory },
{ "libscdlo.a", scd_component_getFactory },
{ "libscfiltlo.a", scfilt_component_getFactory },
@@ -52,29 +42,21 @@ lo_get_factory_map(void)
{ "libsdlo.a", sd_component_getFactory },
{ "libsmdlo.a", smd_component_getFactory },
{ "libsmlo.a", sm_component_getFactory },
- { "libsotlo.a", sot_component_getFactory },
- { "libspelllo.a", spell_component_getFactory },
{ "libspllo.a", spl_component_getFactory },
{ "libsvgfilterlo.a", svgfilter_component_getFactory },
{ "libsvtlo.a", svt_component_getFactory },
{ "libsvxcorelo.a", svxcore_component_getFactory },
- { "libsvxlo.a", svx_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 },
{ "libucppkg1.a", ucppkg1_component_getFactory },
- { "libunordflo.a", unordf_component_getFactory },
- { "libunoxmllo.a", unoxml_component_getFactory },
{ "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 },
- { "libxmlsecurity.a", xmlsecurity_component_getFactory },
- { "libxoflo.a", xof_component_getFactory },
- { "libxolo.a", xo_component_getFactory },
{ NULL, NULL }
};
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index b2bec61..a979279 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -30,20 +30,11 @@ lo_get_libmap(void)
{ "libdatelo.a", date_component_getFactory },
{ "libdbalo.a", dba_component_getFactory },
{ "libdbaxmllo.a", dbaxml_component_getFactory },
- { "libembobj.a", embobj_component_getFactory },
- { "libemboleobj.a", emboleobj_component_getFactory },
- { "libevtattlo.a", evtatt_component_getFactory },
{ "libfilterconfiglo.a", filterconfig1_component_getFactory },
{ "libfrmlo.a", frm_component_getFactory },
- { "libfsstoragelo.a", fsstorage_component_getFactory },
{ "libfwklo.a", fwk_component_getFactory },
- { "libfwllo.a", fwl_component_getFactory },
{ "libfwmlo.a", fwm_component_getFactory },
{ "libhwplo.a", hwp_component_getFactory },
- { "libhyphenlo.a", hyphen_component_getFactory },
- { "liblnglo.a", lng_component_getFactory },
- { "liblnthlo.a", lnth_component_getFactory },
- { "libooxlo.a", oox_component_getFactory },
{ "libpricinglo.a", pricing_component_getFactory },
{ "libscdlo.a", scd_component_getFactory },
{ "libscfiltlo.a", scfilt_component_getFactory },
@@ -52,29 +43,20 @@ lo_get_libmap(void)
{ "libsdlo.a", sd_component_getFactory },
{ "libsmdlo.a", smd_component_getFactory },
{ "libsmlo.a", sm_component_getFactory },
- { "libsotlo.a", sot_component_getFactory },
- { "libspelllo.a", spell_component_getFactory },
{ "libspllo.a", spl_component_getFactory },
{ "libsvgfilterlo.a", svgfilter_component_getFactory },
- { "libsvtlo.a", svt_component_getFactory },
{ "libsvxcorelo.a", svxcore_component_getFactory },
- { "libsvxlo.a", svx_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 },
{ "libucppkg1.a", ucppkg1_component_getFactory },
- { "libunordflo.a", unordf_component_getFactory },
- { "libunoxmllo.a", unoxml_component_getFactory },
{ "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 },
- { "libxmlsecurity.a", xmlsecurity_component_getFactory },
- { "libxoflo.a", xof_component_getFactory },
- { "libxolo.a", xo_component_getFactory },
{ NULL, NULL }
};
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm
b/ios/shared/ios_sharedlo/cxx/mlo.mm
index a9a5eff..3ab258c 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -36,20 +36,13 @@ lo_get_factory_map(void)
//MAP_LIB_LO(fwk), //MAP_LIB_LO(fwm), //MAP_LIB_LO(frm),
//MAP_LIB_LO(pricing), //MAP_LIB_LO(scd), //MAP_LIB_LO(scfilt),
//MAP_LIB_LO(hwp),
- MAP_LIB_LO(hyphen),
//MAP_LIB_LO(dbaxml), //MAP_LIB_LO(sdd), //MAP_LIB_LO(smd),
- MAP_LIB_LO(spell),
//MAP_LIB_LO(svgfilter),//MAP_LIB_LO(t602filter),//MAP_LIB_LO(textfd),
MAP_LIB_LO(uui),
//MAP_LIB_LO(xmlfd),
- MAP_LIB(xmlsecurity), //MAP_LIB_LO(sc), //MAP_LIB_LO(sd),
- MAP_LIB_LO(svx), MAP_LIB_LO(fwl), MAP_LIB_LO(oox),
+ //MAP_LIB_LO(sc), //MAP_LIB_LO(sd),
//MAP_LIB(fileacc),
- MAP_LIB_LO(svt), MAP_LIB_LO(xof),
- MAP_LIB_LO(evtatt), MAP_LIB_LO(fsstorage), MAP_LIB_LO(lng),
- MAP_LIB_LO(swd), MAP_LIB_LO(sw), MAP_LIB_LO(lnth),
- MAP_LIB_LO(unordf), MAP_LIB_LO(unoxml), MAP_LIB_LO(xo),
- MAP_LIB_LO(stocservices), MAP_LIB_LO(reflection),
+ MAP_LIB_LO(swd), MAP_LIB_LO(sw),
// from ANDROID
@@ -61,7 +54,6 @@ lo_get_factory_map(void)
//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),
- MAP_LIB(embobj), MAP_LIB(emboleobj), MAP_LIB_LO(sot),
// ADDED for search
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
