summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2013-12-19 11:06:36 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2013-12-19 15:34:32 +0100
commit43e2cf590a2ca198d50ec2e2ba7d4f4ccab8e9ba (patch)
treec222b26a07e9a6614e5341a264a7e4f30aac13f7 /android
parent8f9c0fe459296ff7cf54417842ed6978cca28b78 (diff)
Deduplicate calc components.
Hopefully it makes sense, I don't know. Inspired by Debian packages. Change-Id: I8caf2d4aa75b8f6de3cc7da9eb293955a4ed58d8
Diffstat (limited to 'android')
-rw-r--r--android/experimental/DocumentLoader/native-code.cxx4
-rw-r--r--android/experimental/LibreOffice4Android/native-code.cxx4
-rw-r--r--android/experimental/desktop/native-code.cxx4
3 files changed, 3 insertions, 9 deletions
diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx
index 7684f46cc3bd..8c8a9bd26640 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 e428f156b52f..7f36ce776cc3 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 13492811844d..695fec4b7e1b 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 },