iOS LibreOfficeLight Activate LibreOfficeKit

Prepare for viewing functionality.

Change-Id: I4960938fdc7bf6955096c96cc7f56792c64c6641

5 files changed, 9 insertions, 28 deletions

diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index cf301c36063e..69d042885342 100644
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
 		397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; };
 		397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift */; };
 		397E09031E597BD8001374E0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 397E09011E597BD8001374E0 /* Main.storyboard */; };
-		397E09061E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 397E09041E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld */; };
 		397E09081E597BD8001374E0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 397E09071E597BD8001374E0 /* Assets.xcassets */; };
 		397E09161E597BD8001374E0 /* LibreOfficeLightTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E09151E597BD8001374E0 /* LibreOfficeLightTests.swift */; };
 		397E09211E597BD8001374E0 /* LibreOfficeLightUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E09201E597BD8001374E0 /* LibreOfficeLightUITests.swift */; };
@@ -58,7 +57,6 @@
 		397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = SOURCE_ROOT; };
 		397E09021E597BD8001374E0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/Main.storyboard; sourceTree = "<group>"; };
-		397E09051E597BD8001374E0 /* LibreOfficeLight.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = LibreOfficeLight.xcdatamodel; sourceTree = "<group>"; };
 		397E09071E597BD8001374E0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = LibreOfficeLight/Assets.xcassets; sourceTree = SOURCE_ROOT; };
 		397E090C1E597BD8001374E0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = LibreOfficeLight/Info.plist; sourceTree = SOURCE_ROOT; };
 		397E09111E597BD8001374E0 /* LibreOfficeLightTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LibreOfficeLightTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -118,7 +116,6 @@
 				397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */,
 				39B084E21E5F0A9600682A59 /* lo.xcconfig */,
 				397E09071E597BD8001374E0 /* Assets.xcassets */,
-				397E09041E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld */,
 				397E090C1E597BD8001374E0 /* Info.plist */,
 				396F92F61E7AE62400A28C82 /* Settings.bundle */,
 			);
@@ -362,7 +359,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources */,
-				397E09061E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld in Sources */,
 				3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */,
 				399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */,
 				3992D85E1E5B764A00BEA987 /* FileManagerController.swift in Sources */,
@@ -711,19 +707,6 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
-
-/* Begin XCVersionGroup section */
-		397E09041E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld */ = {
-			isa = XCVersionGroup;
-			children = (
-				397E09051E597BD8001374E0 /* LibreOfficeLight.xcdatamodel */,
-			);
-			currentVersion = 397E09051E597BD8001374E0 /* LibreOfficeLight.xcdatamodel */;
-			path = LibreOfficeLight.xcdatamodeld;
-			sourceTree = "<group>";
-			versionGroupType = wrapper.xcdatamodel;
-		};
-/* End XCVersionGroup section */
 	};
 	rootObject = 397E08F21E597BD8001374E0 /* Project object */;
 }
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
index ea72bfd5dcad..e50e462939aa 100644
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
@@ -23,10 +23,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool
     {
-        LOkit_Init()
-
+        // start LibreOfficeKit
+        BridgeLOkit_Init()
+        
         // Get version info
-        let appInfo = Bundle.main.infoDictionary as! Dictionary<String,AnyObject>
+        let appInfo = Bundle.main.infoDictionary! as Dictionary<String,AnyObject>
         let applicationVersion = (appInfo["CFBundleShortVersionString"] as! String) + "." +
                                  (appInfo["CFBundleVersion"] as! String)
         let defaults = UserDefaults.standard
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion b/ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
index 446e9ff7b5e7..0c67376ebacb 100644
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>_XCCurrentVersionName</key>
-	<string>LibreOfficeLight.xcdatamodel</string>
-</dict>
+<dict/>
 </plist>
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
index 78ebbe7ee288..2591dd90ae1d 100644
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
@@ -8,6 +8,6 @@
 
 
 // Bridge functions to LibreOfficeKit
-int LOkit_Init();
-int LOkit_ClientCommand(const char *input);
+int BridgeLOkit_Init();
+int BridgeLOkit_ClientCommand(const char *input);
 
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c
index 748c601f268e..ec566a6e78ee 100755
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c
@@ -15,7 +15,7 @@ static LibreOfficeKitDocument* document;
 
 
 // Bridge functions to LibreOfficeKit
-int LOkit_Init()
+int BridgeLOkit_Init()
 {
     // Initialize LibreOfficeKit
     kit = lok_init(NULL);
@@ -294,7 +294,7 @@ static CLIENTCOMMAND clientcommands[] = {{"canceltiles",       false, client_can
 
 
 
-int LOkit_ClientCommand(const char *input)
+int BridgeLOkit_ClientCommand(const char *input)
 {
     static char argStore[2048];
     const char *args[10];