diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-19 10:39:46 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-19 15:34:30 +0100 |
commit | e05e58948c50603f05ab3442721cb0ba393144b5 (patch) | |
tree | a1a68b32c163832a45d2c7a4371da9e19626a92b /ios | |
parent | Fix sal_Int32/int mismatch (diff) | |
download | core-e05e58948c50603f05ab3442721cb0ba393144b5.tar.gz core-e05e58948c50603f05ab3442721cb0ba393144b5.zip |
Deduplicate writer component factories.
Change-Id: I0b82e8a284f871829b7c22a654d61534b5c5a3cc
Diffstat (limited to 'ios')
-rw-r--r-- | ios/experimental/LibreOffice/LibreOffice/lo.mm | 6 | ||||
-rw-r--r-- | ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm | 6 | ||||
-rw-r--r-- | ios/shared/ios_sharedlo/cxx/mlo.mm | 5 |
3 files changed, 6 insertions, 11 deletions
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 |