configure.ac | 2 +-
ios/source/ios.cxx | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 97be9270868990d3d45b29724c8fdc3598d2a64c
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Oct 31 20:30:24 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Wed Oct 31 22:14:32 2018 +0200
Handle also css::ucb::NameClashException>(aException
Change-Id: I979a163e796418d9a693229698b638cec4bf2226
diff --git a/ios/source/ios.cxx b/ios/source/ios.cxx
index 36aaa245f76d..bc89150e7ed6 100644
--- a/ios/source/ios.cxx
+++ b/ios/source/ios.cxx
@@ -8,9 +8,11 @@
*/
#include <cassert>
+#include <iostream>
#include "com/sun/star/uno/Any.hxx"
#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
+#include "com/sun/star/ucb/NameClashException.hpp"
#include "ios/ios.hxx"
namespace
@@ -28,8 +30,12 @@ void lo_ios_throwException(css::uno::Any const& aException)
assert(aException.getValueTypeClass() == css::uno::TypeClass_EXCEPTION);
tryThrow<css::ucb::InteractiveAugmentedIOException>(aException);
+ tryThrow<css::ucb::NameClashException>(aException);
tryThrow<css::uno::RuntimeException>(aException);
+ std::cerr << "lo_ios_throwException: Unhandled exception type " <<
aException.getValueTypeName()
+ << std::endl;
+
assert(false);
}
commit 741e19f7d1e17b3eb6e47ba9b71bd708ea5d5d98
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Oct 31 20:27:45 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Wed Oct 31 22:14:32 2018 +0200
Current iOS SDK is 12.1
It sucks that configure.ac nowadays looks for exactly one specific
version of the iOS SDK. I don't understand why that was thought to be
a good idea.
Change-Id: I5b67e17c627735bbafffc8177f1422813a33e034
diff --git a/configure.ac b/configure.ac
index 0312d7f07841..6fa805b60f9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2956,7 +2956,7 @@ dnl
===================================================================
if test $_os = iOS; then
AC_MSG_CHECKING([what iOS SDK to use])
- current_sdk_ver=12.0
+ current_sdk_ver=12.1
if test "$enable_ios_simulator" = "yes"; then
platform=iPhoneSimulator
versionmin=-mios-simulator-version-min=$current_sdk_ver
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
