[Libreoffice-commits] online.git: 2 commits - ios/Mobile ios/Mobile.xcodeproj

[Libreoffice Gerrit user]

 ios/Mobile.xcodeproj/project.pbxproj |    2 ++
 ios/Mobile/Document.mm               |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b0b2c01a6c38347bd7925f550b0d420a570063f3
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Dec 18 20:39:18 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Dec 18 20:39:18 2018 +0200

    Don't crash if there is no WKJavaScriptExceptionMessage
    
    Change-Id: I90b99ba13e06c511334bc085d43d85126808f42f

diff --git a/ios/Mobile/Document.mm b/ios/Mobile/Document.mm
index 285e660d9..af4ae0a75 100644
--- a/ios/Mobile/Document.mm
+++ b/ios/Mobile/Document.mm
@@ -133,7 +133,10 @@
                                               completionHandler:^(id _Nullable obj, NSError * _Nullable error)
                      {
                          if (error) {
-                             LOG_ERR("Error after " << [js UTF8String] << ": " << [error.userInfo[@"WKJavaScriptExceptionMessage"] UTF8String]);
+                             LOG_ERR("Error after " << [js UTF8String] << ": " << [[error localizedDescription] UTF8String]);
+                             NSString *jsException = error.userInfo[@"WKJavaScriptExceptionMessage"];
+                             if (jsException != nil)
+                                 LOG_ERR("JavaScript exception: " << [jsException UTF8String]);
                          }
                      }
                  ];
commit c909bcd83c54edb72ab39cd2b0e5d1221bfb18c6
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Dec 18 17:01:18 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Dec 18 20:03:52 2018 +0200

    Need offapi headers, too, when building against a 6.0 branch or core
    
    Change-Id: I4bce152cd286f66aaed1f8354a21c76a27e771b0

diff --git a/ios/Mobile.xcodeproj/project.pbxproj b/ios/Mobile.xcodeproj/project.pbxproj
index cdb1af4b8..b9922e572 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -1653,6 +1653,7 @@
 					"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/CustomTarget/ios",
 					"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/UnpackedTarball/libpng",
 					"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/UnoApiHeadersTarget/udkapi/comprehensive",
+					"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/UnoApiHeadersTarget/offapi/comprehensive",
 					"$(SOURCE_ROOT)/../pocoinclude-symlink",
 				);
 				INFOPLIST_FILE = Mobile/Info.plist;
@@ -1711,6 +1712,7 @@
 					"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/CustomTarget/ios",
 					"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/UnpackedTarball/libpng",
 					"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/UnoApiHeadersTarget/udkapi/comprehensive",
+					"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/UnoApiHeadersTarget/offapi/comprehensive",
 					"$(SOURCE_ROOT)/../pocoinclude-symlink",
 				);
 				INFOPLIST_FILE = Mobile/Info.plist;