iOS, allow calls to LibreOfficeKit from swift

Extended the bridge to include original LibreOfficeKit.h
as well as Kit pointer (set in init call)

Change-Id: I5e96f2706ac4d1ee897b977d3322bdc1b91f1a0b

ios/CustomTarget_iOS_prelink.mk

@@ -6,8 +6,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #- Env ------------------------------------------------------------------------
-IOSDEV = /Applications/Xcode.app/Contents/Developer/
-IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+IOSLD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
 IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
 
 ifeq ($(ENABLE_DEBUG),TRUE)
@@ -35,8 +34,7 @@ $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE
 	    -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
 	    -o $(IOSOBJ) \
 	    $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
-	    `$(SRCDIR)/bin/lo-all-static-libs` \
-	    $(call gb_StaticLibrary_get_target,iOS_kitBridge)
+	    `$(SRCDIR)/bin/lo-all-static-libs`
 	$(AR) -r $(IOSKIT) $(IOSOBJ)
 
 

ios/source/LibreOfficeKit.c

@@ -7,14 +7,13 @@
 //
 #include <stdio.h>
 #include <TargetConditionals.h>
-#define LOK_USE_UNSTABLE_API
+#define LOK_USE_UNSTABLE_API 1
+#include "LibreOfficeKit.h"
+
 #include <LibreOfficeKit/LibreOfficeKitInit.h>
 
 #include <osl/process.h>
 
-//#include <unicode/udata.h>
-//#include <unicode/ucnv.h>
-
 // generated by solenv/bin/native-code.py:
 #include "native-code.h"
 
@@ -24,7 +23,7 @@ extern __attribute__((used)) void *libreofficekit_hook(const char *);
 static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook;
 
 // pointers to our instance
-static LibreOfficeKit* kit;
+LibreOfficeKit* kit;
 static LibreOfficeKitDocument* document;
 
 

ios/source/LibreOfficeKit.h

@@ -18,3 +18,17 @@ int BridgeLOkit_open(const char *path);
 int BridgeLOkit_ClientCommand(const char *input);
 int BridgeLOkit_Hipernate(void);
 int BridgeLOkit_LeaveHipernate(void);
+
+
+// Use LOK_USE_UNSTABLE_API to get access to the low level
+// LibreOfficeKit.
+// REMARK: There are no guarantee these functions will work !!
+// REMARK: BridgeLOkit_Init MUST be called, NOT the original init()
+
+#ifdef LOK_USE_UNSTABLE_API
+#include <LibreOfficeKit/LibreOfficeKit.h>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+
+extern LibreOfficeKit* kit;
+#endif
+