summaryrefslogtreecommitdiff
path: root/ios
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-11-29 16:03:27 +0100
committerJan Holesovsky <kendy@collabora.com>2019-12-05 11:02:01 +0100
commiteb15ac837e06087fb8148330e9171d6697d89ee6 (patch)
tree5accb155a2a778db3ce6872685b0f86e1231e37d /ios
parenta8cd98c437f2c3b5c4f7c139aa7223c5cfb74d1a (diff)
android: Avoid throwing exceptions through the bridges.
From some reason it does not work, so let's do the same we are doing on iOS; at least for now. Change-Id: I915f8683a112548fc3defc1114f9dce3aa7be30e Reviewed-on: https://gerrit.libreoffice.org/84067 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/84204 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'ios')
-rw-r--r--ios/Module_ios.mk1
-rw-r--r--ios/StaticLibrary_ios.mk20
-rw-r--r--ios/source/ios.cxx42
3 files changed, 0 insertions, 63 deletions
diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk
index ea9c44644f2c..259c34ba3416 100644
--- a/ios/Module_ios.mk
+++ b/ios/Module_ios.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,ios))
ifeq ($(OS),iOS)
$(eval $(call gb_Module_add_targets,ios,\
- StaticLibrary_ios \
CustomTarget_iOS_setup \
))
diff --git a/ios/StaticLibrary_ios.mk b/ios/StaticLibrary_ios.mk
deleted file mode 100644
index 36baff4e064b..000000000000
--- a/ios/StaticLibrary_ios.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,ios))
-
-$(eval $(call gb_StaticLibrary_use_api,ios,\
- udkapi \
- offapi \
-))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,ios,\
- ios/source/ios \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/ios/source/ios.cxx b/ios/source/ios.cxx
deleted file mode 100644
index bc89150e7ed6..000000000000
--- a/ios/source/ios.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#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
-{
-template <class E> void tryThrow(css::uno::Any const& aException)
-{
- E aSpecificException;
- if (aException >>= aSpecificException)
- throw aSpecificException;
-}
-}
-
-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);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */