summaryrefslogtreecommitdiff
path: root/ios/shared
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2013-12-31 15:05:01 +0100
committerTor Lillqvist <tml@collabora.com>2014-01-01 17:33:29 +0200
commit645fb66bbdf756cedbcbcfd8be59ce9f58b2e731 (patch)
tree40177b3e17190bc89ae8c54fbc3262cb1d88a76f /ios/shared
parentc48ecfaf2b31f6dd64b6c779ed3a076a7efbc113 (diff)
Use native-code.py generated code also for iOS.
This allows us to get rid of component-declarations.h and simplify component-mapping.h. For new, converted, implementation_getFactories, adding one line into native-code.py should be enough to make them available in application. Change-Id: I042320e5b7f8a9aa9f02b77d2bdd07cf9a690ee6
Diffstat (limited to 'ios/shared')
-rw-r--r--ios/shared/ios_sharedlo/cxx/mlo.mm33
1 files changed, 2 insertions, 31 deletions
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm b/ios/shared/ios_sharedlo/cxx/mlo.mm
index 8095b2af19c1..4279d0d8a5d9 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -13,41 +13,12 @@
#import <UIKit/UIKit.h>
#include <postmac.h>
-#include <osl/detail/component-mapping.h>
#include <touch/touch.h>
#undef TimeValue
#include <osl/process.h>
-#define MAP_LIB(LIB) { "lib" #LIB ".a", LIB##_component_getFactory }
-#define MAP_LIB_LO(LIB) { "lib" #LIB "lo.a", LIB##_component_getFactory }
-#define MAP_LIB_LO_1(LIB) { "lib" #LIB "lo.a", LIB##1_component_getFactory }
-
-extern "C"
-const lib_to_factory_mapping *
-lo_get_factory_map(void)
-{
- static lib_to_factory_mapping map[] = {
- LO_CORE_FACTORY_MAP
- LO_WRITER_CORE_FACTORY_MAP
- MAP_LIB_LO(uui),
- MAP_LIB_LO(i18nsearch),
- { NULL, NULL }
- };
-
- return map;
-}
-
-extern "C"
-const lib_to_constructor_mapping *
-lo_get_constructor_map(void)
-{
- static lib_to_constructor_mapping map[] = {
- NON_APP_SPECIFIC_CONSTRUCTOR_MAP
- { NULL, NULL }
- };
-
- return map;
-}
+// generated by solenv/bin/native-code.py:
+#include "native-code.mm"
NSString * createPaths(NSString * base,NSString * appRootEscaped,NSArray * fileNames){
NSString * prefix = @"file://";