android/experimental/DocumentLoader/native-code.cxx | 30 +-------
android/experimental/LibreOffice4Android/native-code.cxx | 39 +----------
android/experimental/desktop/native-code.cxx | 36 +---------
include/osl/detail/component-mapping.h | 53 ++++++++++++++-
ios/experimental/LibreOffice/LibreOffice/lo.mm | 38 +---------
ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm | 41 +----------
ios/shared/ios_sharedlo/cxx/mlo.mm | 32 ---------
7 files changed, 86 insertions(+), 183 deletions(-)
New commits:
commit 645dac2f9434d70d4aa393bac899b9984f533b20
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Thu Dec 19 12:16:09 2013 +0100
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
diff --git a/android/experimental/DocumentLoader/native-code.cxx
b/android/experimental/DocumentLoader/native-code.cxx
index 8c8a9bd..7cba377 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 7f36ce7..44cb862 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 695fec4..6b8deab 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 0ab4280..95625fc 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 bf031f2..bfdbdc5 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 6152277..0eaea4e 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 ab6851a..8095b2a 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 }
commit 6275751f63e44071de1d7486300be16deec13e3a
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Thu Dec 19 11:08:37 2013 +0100
fix typo
Change-Id: I52bbae367d1b4a76aa5507daa38582f7c97d794d
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index fcbf7c5..6152277 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -18,7 +18,7 @@
extern "C"
const lib_to_factory_mapping *
-lo_get_libmap(void)
+lo_get_factory_map(void)
{
static lib_to_factory_mapping map[] = {
LO_CORE_FACTORY_MAP
commit 43e2cf590a2ca198d50ec2e2ba7d4f4ccab8e9ba
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Thu Dec 19 11:06:36 2013 +0100
Deduplicate calc components.
Hopefully it makes sense, I don't know.
Inspired by Debian packages.
Change-Id: I8caf2d4aa75b8f6de3cc7da9eb293955a4ed58d8
diff --git a/android/experimental/DocumentLoader/native-code.cxx
b/android/experimental/DocumentLoader/native-code.cxx
index 7684f46..8c8a9bd 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 e428f15..7f36ce7 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 1349281..695fec4 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 b46964a..0ab4280 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 c8d10a3..bf031f2 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 b65366f..fcbf7c5 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 },
commit 8f9c0fe459296ff7cf54417842ed6978cca28b78
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Thu Dec 19 10:45:12 2013 +0100
bin few comments
It's not a good way to add invidual components.
We aim to create some groups of them.
Change-Id: I752c2b01c1c800d3eb446403ff7fc9e6da3aa635
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm
b/ios/shared/ios_sharedlo/cxx/mlo.mm
index b72f1f7..ab6851a 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -29,35 +29,8 @@ lo_get_factory_map(void)
static lib_to_factory_mapping map[] = {
LO_CORE_FACTORY_MAP
LO_WRITER_FACTORY_MAP
-
- //from IOS
-
- //MAP_LIB_LO(analysis), //MAP_LIB_LO(animcore), //MAP_LIB_LO(sm),
- //MAP_LIB_LO(avmedia), //MAP_LIB_LO(dba), //MAP_LIB_LO(date),
- //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(dbaxml), //MAP_LIB_LO(sdd), //MAP_LIB_LO(smd),
- //MAP_LIB_LO(svgfilter),//MAP_LIB_LO(t602filter),//MAP_LIB_LO(textfd),
MAP_LIB_LO(uui),
- //MAP_LIB_LO(xmlfd),
- //MAP_LIB_LO(sc), //MAP_LIB_LO(sd),
- //MAP_LIB(fileacc),
-
- // from ANDROID
-
- //MAP_LIB_LO(cui), //MAP_LIB_LO(basprov),
//MAP_LIB_LO(chartcore),
- //MAP_LIB_LO(dlgprov), //MAP_LIB_LO(vclcanvas),//MAP_LIB_LO(sb),
- //MAP_LIB(scriptframe), //MAP_LIB_LO(vbaevents),
- //MAP_LIB_LO(spl), //MAP_LIB_LO(tk),
//MAP_LIB_LO(stringresource),
- //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),
-
- // ADDED for search
-
MAP_LIB_LO(i18nsearch),
-
{ NULL, NULL }
};
commit e05e58948c50603f05ab3442721cb0ba393144b5
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Thu Dec 19 10:39:46 2013 +0100
Deduplicate writer component factories.
Change-Id: I0b82e8a284f871829b7c22a654d61534b5c5a3cc
diff --git a/android/experimental/DocumentLoader/native-code.cxx
b/android/experimental/DocumentLoader/native-code.cxx
index 50bec62..7684f46 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 02ceaec..e428f15 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 4dbf23d..1349281 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 a22b86d..b46964a 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 1710c3e..c8d10a3 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 a979279..b65366f 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 3ab258c..b72f1f7 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
