iOS, upgrade and moved LOKit_init.

Upgrade to new version of frameworks.

Moved LOKit_init to "didFinishLaunching" to "DidBecomeActive"

Change-Id: I2f805c4a9d21b049362fec1ec5258496b9505260

3 files changed, 8 insertions, 19 deletions

diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
index 97693370478a..a1e97161d873 100644
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
@@ -23,9 +23,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool
     {
-        // start LibreOfficeKit
-        BridgeLOkit_Init(Bundle.main.bundlePath)
-        
         // Get version info
         let appInfo = Bundle.main.infoDictionary! as Dictionary<String,AnyObject>
         let applicationVersion = (appInfo["CFBundleShortVersionString"] as! String) + "." +
@@ -75,8 +72,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate
 
     func applicationDidBecomeActive(_ application: UIApplication)
     {
-        // Restart any tasks that were paused (or not yet started) while the application was inactive.
-        // If the application was previously in the background, optionally refresh the user interface.
+        // start LibreOfficeKit
+        BridgeLOkit_Init(Bundle.main.bundlePath)
     }
 
 
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
index 7bf3f6963421..bae2722a17fa 100755
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="DGj-7d-jfR">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="DGj-7d-jfR">
     <device id="ipad9_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="Navigation items with more than one left or right bar item" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -741,7 +741,7 @@
         <image name="menu" width="22" height="22"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="0PG-d7-Fy1"/>
-        <segue reference="etF-bX-EXf"/>
+        <segue reference="MPj-WI-cxX"/>
+        <segue reference="nga-Gl-Vki"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm
index e3ba0ac91432..a0c9c0b6eedd 100755
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm
@@ -36,16 +36,8 @@ extern "C" int BridgeLOkit_Init(const char *path)
     strcpy(bufUserPath + strlen(path), "/user");
     
     // Initialize LibreOfficeKit
-    kit = lok_init_2(path, bufUserPath);
-
-    udata_setCommonData(NULL, NULL);
-    ucnv_open("iso-8859-3", NULL);
-
-    ucnv_getName(NULL,NULL);
-    ucnv_close(NULL);
-    osl_setCommandArgs(8, NULL);
-    kit->pClass->documentLoad(kit, NULL);
-    document->pClass->initializeForRendering(document, "");
+    if (!kit)
+      kit = lok_init_2(path, bufUserPath);
     return 0;
 }