diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-31 15:05:01 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-01-01 17:33:29 +0200 |
| commit | 645fb66bbdf756cedbcbcfd8be59ce9f58b2e731 (patch) | |
| tree | 40177b3e17190bc89ae8c54fbc3262cb1d88a76f /ios/experimental | |
| parent | c48ecfaf2b31f6dd64b6c779ed3a076a7efbc113 (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/experimental')
| -rw-r--r-- | ios/experimental/LibreOffice/LibreOffice/lo.mm | 31 | ||||
| -rw-r--r-- | ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm | 30 |
2 files changed, 4 insertions, 57 deletions
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm index 04760a75bf91..3e69eb74c803 100644 --- a/ios/experimental/LibreOffice/LibreOffice/lo.mm +++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm @@ -12,38 +12,11 @@ #import <UIKit/UIKit.h> #include <postmac.h> -#include <osl/detail/component-mapping.h> #include <osl/process.h> #include <touch/touch.h> -extern "C" -const lib_to_factory_mapping * -lo_get_factory_map(void) -{ - static lib_to_factory_mapping map[] = { - LO_EXTENDED_CORE_FACTORY_MAP - LO_WRITER_FACTORY_MAP - { "libcuilo.a", cui_component_getFactory }, - { "libspllo.a", spl_component_getFactory }, - { "libsvtlo.a", svt_component_getFactory }, - { "libuuilo.a", uui_component_getFactory }, - { 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" extern "C" void diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm index 755ff1a2384f..09cdc95d7605 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm @@ -12,37 +12,11 @@ #import <UIKit/UIKit.h> #include <postmac.h> -#include <osl/detail/component-mapping.h> #include <osl/process.h> #include <touch/touch.h> -extern "C" -const lib_to_factory_mapping * -lo_get_factory_map(void) -{ - static lib_to_factory_mapping map[] = { - LO_EXTENDED_CORE_FACTORY_MAP - LO_WRITER_FACTORY_MAP - { "libcuilo.a", cui_component_getFactory }, - { "libspllo.a", spl_component_getFactory }, - { "libuuilo.a", uui_component_getFactory }, - { 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" static NSString *createPaths(NSString *base, NSString *appRootEscaped, NSArray *fileNames) { |