diff options
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/experimental/LibreOffice/LibreOffice/lo.mm | 16 | ||||
| -rw-r--r-- | ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm | 16 | ||||
| -rw-r--r-- | ios/qa/sc/filters-test.m | 4 | ||||
| -rw-r--r-- | ios/shared/ios_sharedlo/cxx/mlo.mm | 16 |
4 files changed, 26 insertions, 26 deletions
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm index 5da9455f96a0..bce3874b33d3 100644 --- a/ios/experimental/LibreOffice/LibreOffice/lo.mm +++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm @@ -17,11 +17,11 @@ #include <touch/touch.h> extern "C" -const lib_to_component_mapping * -lo_get_library_map(void) +const lib_to_factory_mapping * +lo_get_factory_map(void) { - static lib_to_component_mapping map[] = { - NON_APP_SPECIFIC_COMPONENT_MAP + static lib_to_factory_mapping map[] = { + NON_APP_SPECIFIC_FACTORY_MAP { "libanalysislo.a", analysis_component_getFactory }, { "libanimcorelo.a", animcore_component_getFactory }, { "libavmedialo.a", avmedia_component_getFactory }, @@ -82,11 +82,11 @@ lo_get_library_map(void) } extern "C" -const lib_to_component_mapping * -lo_get_implementation_map(void) +const lib_to_constructor_mapping * +lo_get_constructor_map(void) { - static lib_to_component_mapping map[] = { - NON_APP_SPECIFIC_DIRECT_COMPONENT_MAP + static lib_to_constructor_mapping map[] = { + NON_APP_SPECIFIC_CONSTRUCTOR_MAP { NULL, NULL } }; diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm index 074e4723096c..b2bec61f70f3 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm @@ -17,11 +17,11 @@ #include <touch/touch.h> extern "C" -const lib_to_component_mapping * -lo_get_library_map(void) +const lib_to_factory_mapping * +lo_get_libmap(void) { - static lib_to_component_mapping map[] = { - NON_APP_SPECIFIC_COMPONENT_MAP + static lib_to_factory_mapping map[] = { + NON_APP_SPECIFIC_FACTORY_MAP { "libanalysislo.a", analysis_component_getFactory }, { "libanimcorelo.a", animcore_component_getFactory }, { "libavmedialo.a", avmedia_component_getFactory }, @@ -82,11 +82,11 @@ lo_get_library_map(void) } extern "C" -const lib_to_component_mapping * -lo_get_implementation_map(void) +const lib_to_constructor_mapping * +lo_get_constructor_map(void) { - static lib_to_component_mapping map[] = { - NON_APP_SPECIFIC_DIRECT_COMPONENT_MAP + static lib_to_constructor_mapping map[] = { + NON_APP_SPECIFIC_CONSTRUCTOR_MAP { NULL, NULL } }; diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m index c1dade90025b..e732687c8df9 100644 --- a/ios/qa/sc/filters-test.m +++ b/ios/qa/sc/filters-test.m @@ -29,10 +29,10 @@ extern void * sc_component_getFactory( const char * pImplName, void * pServiceMa extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); -const lib_to_component_mapping * +const lib_to_factory_mapping * lo_get_libmap(void) { - static lib_to_component_mapping map[] = { + static lib_to_factory_mapping map[] = { { "libanalysislo.a", analysis_component_getFactory }, { "libdatelo.a", date_component_getFactory }, { "libscfiltlo.a", scfilt_component_getFactory }, diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm b/ios/shared/ios_sharedlo/cxx/mlo.mm index 6dc4ad1a7bc6..a9a5effd2eb0 100644 --- a/ios/shared/ios_sharedlo/cxx/mlo.mm +++ b/ios/shared/ios_sharedlo/cxx/mlo.mm @@ -23,11 +23,11 @@ #define MAP_LIB_LO_1(LIB) { "lib" #LIB "lo.a", LIB##1_component_getFactory } extern "C" -const lib_to_component_mapping * -lo_get_library_map(void) +const lib_to_factory_mapping * +lo_get_factory_map(void) { - static lib_to_component_mapping map[] = { - NON_APP_SPECIFIC_COMPONENT_MAP + static lib_to_factory_mapping map[] = { + NON_APP_SPECIFIC_FACTORY_MAP //from IOS @@ -74,11 +74,11 @@ lo_get_library_map(void) } extern "C" -const lib_to_component_mapping * -lo_get_implementation_map(void) +const lib_to_constructor_mapping * +lo_get_constructor_map(void) { - static lib_to_component_mapping map[] = { - NON_APP_SPECIFIC_DIRECT_COMPONENT_MAP + static lib_to_constructor_mapping map[] = { + NON_APP_SPECIFIC_CONSTRUCTOR_MAP { NULL, NULL } }; |