distro-configs/LibreOfficeiOS.conf | 8 -------- ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeKit.mm | 11 ++++++++--- 2 files changed, 8 insertions(+), 11 deletions(-)
New commits: commit 0df51086b71af8755f3eacca8a3c2dd1329fa191 Author: jan Iversen <[email protected]> Date: Wed Oct 11 11:58:32 2017 +0200 iOS, make linking of LO dependent Added a flag to remove need for LO in app, this allows faster change of UI changes. Change-Id: Iad3be518733cbd3ce092eebab76f8f66e91e579d diff --git a/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeKit.mm b/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeKit.mm index 677386ce196b..501c21cea8ae 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeKit.mm +++ b/ios/LibreOfficeLight/LibreOfficeLight/LibreOfficeKit.mm @@ -9,16 +9,16 @@ #include <TargetConditionals.h> #define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitInit.h> - #include <osl/process.h> - #include <unicode/udata.h> #include <unicode/ucnv.h> +//#define NO_LO + // generated by solenv/bin/native-code.py: +#ifndef NO_LO #include "native-code.mm" - // Force reference to libreofficekit_hook extern "C" __attribute__((used)) void *libreofficekit_hook(const char *); static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook; @@ -26,6 +26,7 @@ static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook; // pointers to our instance static LibreOfficeKit* kit; static LibreOfficeKitDocument* document; +#endif @@ -38,15 +39,19 @@ extern "C" int BridgeLOkit_Init(const char *path) strcpy(bufUserPath + strlen(path), "/user"); // Initialize LibreOfficeKit +#ifndef NO_LO if (!kit) kit = lok_init_2(path, bufUserPath); +#endif return 0; } int LOkit_open(char *file) { +#ifndef NO_LO document = kit->pClass->documentLoad(kit, file); document->pClass->initializeForRendering(document, ""); +#endif return 0; } commit dd292ad0c87c2657de0722e0eff30c84ad30efba Author: jan Iversen <[email protected]> Date: Wed Oct 11 11:56:58 2017 +0200 iOS, support for more 3rd party libraries Change-Id: I56bd134bc854578f52a56256e164a3279a0c74b1 diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf index e53884470923..56737ffe42dc 100644 --- a/distro-configs/LibreOfficeiOS.conf +++ b/distro-configs/LibreOfficeiOS.conf @@ -21,21 +21,13 @@ --disable-dbgutil --disable-dconf --disable-dependency-tracking ---disable-dynamic-loading ---disable-epm --disable-extensions ---disable-gltf ---disable-gstreamer-0-10 ---disable-gstreamer-1-0 --disable-kde4 --disable-odk --disable-openssl --disable-pdfium --disable-python ---disable-randr ---disable-scripting ---without-galleries --without-tls --enable-debug _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
