[Libreoffice-commits] core.git: 3 commits - configure.ac ios/LibreOfficeLight
jan Iversen
jani at libreoffice.org
Thu Nov 2 17:17:16 UTC 2017
configure.ac | 6 --
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 26 ++++++----
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json | 15 +++--
ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift | 21 ++++----
ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard | 12 ----
5 files changed, 41 insertions(+), 39 deletions(-)
New commits:
commit 7ce46742e9ba7411a987ff5fe9b54091a5a9ad58
Author: jan Iversen <jani at libreoffice.org>
Date: Thu Nov 2 18:14:19 2017 +0100
iOS, update to new xcode
Updated settings to new xcode
Change-Id: I04eed7eaaf02dda69b4dbce7376b883478b78d27
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 95d1ef3008e1..bb8222ec9369 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -45,6 +45,9 @@
393975791F8BECC1002DC80B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "lokit-Bridging-Header.h"; sourceTree = "<group>"; };
39503A741F94D44900F19C78 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
+ 3956B72E1FAB3E0D00BF5DE4 /* appquit.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = appquit.cxx; path = ../../sfx2/source/appl/appquit.cxx; sourceTree = "<group>"; };
+ 3956B7301FAB3E4700BF5DE4 /* appdata.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = appdata.cxx; path = ../../sfx2/source/appl/appdata.cxx; sourceTree = "<group>"; };
+ 3956B7321FAB3E7300BF5DE4 /* docinsert.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = docinsert.cxx; path = ../../sfx2/source/doc/docinsert.cxx; sourceTree = "<group>"; };
396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LibreOfficeLight.entitlements; sourceTree = "<group>"; };
397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
@@ -94,6 +97,16 @@
path = LibreOfficeLight;
sourceTree = SOURCE_ROOT;
};
+ 3956B72D1FAB3DBF00BF5DE4 /* extra */ = {
+ isa = PBXGroup;
+ children = (
+ 3956B7321FAB3E7300BF5DE4 /* docinsert.cxx */,
+ 3956B7301FAB3E4700BF5DE4 /* appdata.cxx */,
+ 3956B72E1FAB3E0D00BF5DE4 /* appquit.cxx */,
+ );
+ name = extra;
+ sourceTree = "<group>";
+ };
3972753A1E77D9F7006ACDCC /* Frameworks */ = {
isa = PBXGroup;
children = (
@@ -107,6 +120,7 @@
397E08F11E597BD8001374E0 = {
isa = PBXGroup;
children = (
+ 3956B72D1FAB3DBF00BF5DE4 /* extra */,
39B084E41E5F0B5200682A59 /* Resources */,
3911D89F1E5993600050D6BC /* Support files */,
397E08FC1E597BD8001374E0 /* LibreOfficeLight */,
@@ -186,7 +200,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
- LastUpgradeCheck = 0900;
+ LastUpgradeCheck = 0910;
ORGANIZATIONNAME = jani;
TargetAttributes = {
397E08F91E597BD8001374E0 = {
@@ -481,10 +495,9 @@
PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h";
- SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
- SWIFT_WHOLE_MODULE_OPTIMIZATION = YES;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
};
@@ -511,9 +524,9 @@
PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h";
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
- SWIFT_WHOLE_MODULE_OPTIMIZATION = YES;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
};
@@ -634,10 +647,9 @@
PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h";
- SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
- SWIFT_WHOLE_MODULE_OPTIMIZATION = YES;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
};
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
index f26318c08f8e..4b00f7db80bf 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -17,8 +17,8 @@
"scale" : "1x"
},
{
- "idiom" : "ipad",
"size" : "29x29",
+ "idiom" : "ipad",
"filename" : "LibreOffice-29x29 at 2x.png",
"scale" : "2x"
},
@@ -28,8 +28,8 @@
"scale" : "1x"
},
{
- "idiom" : "ipad",
"size" : "40x40",
+ "idiom" : "ipad",
"filename" : "LibreOffice-40x40 at 2x.png",
"scale" : "2x"
},
@@ -40,20 +40,25 @@
"scale" : "1x"
},
{
- "idiom" : "ipad",
"size" : "76x76",
+ "idiom" : "ipad",
"filename" : "LibreOffice-76x76 at 2x.png",
"scale" : "2x"
},
{
- "idiom" : "ipad",
"size" : "83.5x83.5",
+ "idiom" : "ipad",
"filename" : "LibreOffice-83.5x83.5 at 2x.png",
"scale" : "2x"
},
+ {
+ "idiom" : "ios-marketing",
+ "size" : "1024x1024",
+ "scale" : "1x"
+ }
],
"info" : {
"version" : 1,
"author" : "xcode"
}
-}
+}
\ No newline at end of file
commit 7178336b59060f9846f5e15ef95b923d0be1c8df
Author: jan Iversen <jani at libreoffice.org>
Date: Thu Nov 2 18:09:14 2017 +0100
iOS, remove bitcode from compiler
compiling with bitcode slows builds process
Change-Id: Icee263652d31f3a7a6e92a91ef5320a804d0bef1
diff --git a/configure.ac b/configure.ac
index 2744367421c4..2537a1689b69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2837,11 +2837,9 @@ if test $_os = iOS; then
if test "$enable_ios_simulator" = "yes"; then
platform=iPhoneSimulator
versionmin=-mios-simulator-version-min=10.3
- BITNESS=-fembed-bitcode
else
platform=iPhoneOS
versionmin=-miphoneos-version-min=10.3
- BITNESS=-fembed-bitcode
fi
xcode_developer=`xcode-select -print-path`
@@ -2874,8 +2872,8 @@ if test $_os = iOS; then
stdlib="-stdlib=libc++"
- CC="`xcrun -find clang` -arch $host_cpu -fvisibility=hidden $BITNESS -isysroot $sysroot $lto $versionmin"
- CXX="`xcrun -find clang++` -arch $host_cpu -fvisibility=hidden $stdlib $BITNESS -isysroot $sysroot $lto $versionmin"
+ CC="`xcrun -find clang` -arch $host_cpu -fvisibility=hidden -isysroot $sysroot $lto $versionmin"
+ CXX="`xcrun -find clang++` -arch $host_cpu -fvisibility=hidden $stdlib -isysroot $sysroot $lto $versionmin"
INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
AR=`xcrun -find ar`
commit d01f0d53ca5eefb81f10a6f52b1531e8bb781069
Author: jan Iversen <jani at libreoffice.org>
Date: Tue Oct 31 08:09:47 2017 +0100
iOS activated full build for test
Removed compile of dummyLO, meaining full link is performed
(to test LOkit_open)
Removed faulty properties in property view scene
Change-Id: I980cadaf98d40f3e497ee6aa69cb6166fa1b87f7
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index c0552f230cea..95d1ef3008e1 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
39022C1D1EDC2A2C00100066 /* services in Resources */ = {isa = PBXBuildFile; fileRef = 39022C1C1EDC2A2C00100066 /* services */; };
39022C1F1EDC2AB000100066 /* share in Resources */ = {isa = PBXBuildFile; fileRef = 39022C1E1EDC2AB000100066 /* share */; };
39022C211EDC2D0800100066 /* icudt59l.dat in Resources */ = {isa = PBXBuildFile; fileRef = 39022C201EDC2D0800100066 /* icudt59l.dat */; };
- 39284DB11FA5E150006F43E4 /* dummyLOkit.c in Sources */ = {isa = PBXBuildFile; fileRef = 39284DB01FA5E150006F43E4 /* dummyLOkit.c */; };
39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39284DB21FA5F207006F43E4 /* DocumentActions.swift */; };
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */; };
393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
@@ -259,7 +258,6 @@
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources */,
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */,
39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */,
- 39284DB11FA5E150006F43E4 /* dummyLOkit.c in Sources */,
3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources */,
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */,
39EF4E2F1FA500C9001914AC /* PropertiesController.swift in Sources */,
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
index 22daae15f787..e1949f4cb90c 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
+++ b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
@@ -55,6 +55,8 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentBrowserViewC
// background really means hipernate by terminating all threads and solely keep the
// data
+
+
// Moving to hipernate
public func Hipernate() -> Void
{
@@ -195,19 +197,16 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentBrowserViewC
// *** handling of menu actions
// This is the real base of the application
-
+ var openMenu : UIDocumentBrowserViewController? = nil
// Load document into LibreOfficeKit and present it
internal func startOpenDocument()
{
- let openMenu = UIDocumentBrowserViewController()
- openMenu.allowsDocumentCreation = true
-
- //FIXME
- //UIDocumentBrowserViewController.ImportMode = UIDocumentBrowserViewController.ImportMode.none // copy, move
- //openMenu.InterfaceStyle = UIDocumentPickerViewController.dark
- openMenu.delegate = self
- self.present(openMenu, animated: true, completion: nil)
+ openMenu = UIDocumentBrowserViewController()
+ openMenu?.allowsDocumentCreation = true
+ openMenu?.browserUserInterfaceStyle = UIDocumentBrowserViewController.BrowserUserInterfaceStyle.dark
+ openMenu?.delegate = self
+ self.present(openMenu!, animated: true, completion: nil)
print("menu Open... to be done")
}
@@ -306,6 +305,8 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentBrowserViewC
internal func documentBrowser(_ controller: UIDocumentBrowserViewController,
didPickDocumentURLs documentURLs: [URL])
{
+ openMenu?.dismiss(animated: true, completion: nil)
+ openMenu = nil
doOpen(documentURLs[0])
}
@@ -319,7 +320,7 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentBrowserViewC
public func doOpen(_ docURL : URL)
{
//FIXME
- //BridgeLOkit_open(documentURLs);
+ BridgeLOkit_open(docURL.absoluteString);
}
}
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
index 338597acbbc9..e2748dad3c8c 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
+++ b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
@@ -252,18 +252,6 @@
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
- <navigationItem key="navigationItem" title="Properties" id="9nH-at-6AF">
- <barButtonItem key="leftBarButtonItem" image="menu" id="wYo-zq-cqh">
- <connections>
- <action selector="doProporties:" destination="h7c-B7-pKT" id="Yls-8o-msb"/>
- </connections>
- </barButtonItem>
- <barButtonItem key="rightBarButtonItem" systemItem="trash" id="25I-J4-o11">
- <connections>
- <action selector="doDelete:" destination="h7c-B7-pKT" id="c6k-Q0-vtQ"/>
- </connections>
- </barButtonItem>
- </navigationItem>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="vaO-NX-hiP" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
More information about the Libreoffice-commits
mailing list