mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deduplicate calc components.

Browse Source 
Hopefully it makes sense, I don't know.
Inspired by Debian packages.

Change-Id: I8caf2d4aa75b8f6de3cc7da9eb293955a4ed58d8
This commit is contained in:
Matúš Kukan
2013-12-19 11:06:36 +01:00
parent 8f9c0fe459
commit 43e2cf590a
6 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/experimental/DocumentLoader/native-code.cxx
View File

@@ -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 },

4
android/experimental/LibreOffice4Android/native-code.cxx
View File

@@ -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 },

4
android/experimental/desktop/native-code.cxx
View File

@@ -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 },

11
include/osl/detail/component-mapping.h
View File

@@ -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 }, \

7
ios/experimental/LibreOffice/LibreOffice/lo.mm
View File

@@ -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 },

7
ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
View File

@@ -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 },