diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-05 16:55:17 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-05 20:17:24 +0100 |
| commit | cd6b32ef1f3348ce8e529c5f808b704ff728c240 (patch) | |
| tree | 79db5860cc3e9c8edce0ae5a40dca2df739749b1 | |
| parent | 5c7d0c5bafd244f1bfb3930e0229f1f3f2371c82 (diff) | |
tdf#127781 Android Viewer: aarch64: Avoid throwing exceptions through bridges
This basically extends what commit
eb15ac837e06087fb8148330e9171d6697d89ee6 ("android: Avoid
throwing exceptions through the bridges.", 2019-11-29), amended
by f2f8a2ec10d87ffb23949338a9e4da1e1d704644 ("android:
Actually let's avoid the exceptions via bridges only on aarch4.",
2019-12-02) did for the online-based Android app to cover the Android
Viewer case as well.
This makes Android Viewer work on aarch64, which previously crashed
whenever trying to load a document.
Change-Id: Id8b30e1dced583159cc4d81aaa18f4c25b901cff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90047
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | cppuhelper/source/exc_thrower.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index 5fa7c7330fe5..7c40d12db16e 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -173,7 +173,7 @@ ExceptionThrower::ExceptionThrower() class theExceptionThrower : public rtl::Static<ExceptionThrower, theExceptionThrower> {}; -#if defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK) +#if defined(IOS) || (defined(__aarch64__) && defined(ANDROID)) // In the native iOS / Android app, where we don't have any Java, Python, // BASIC, or other scripting, the only thing that would use the C++/UNO bridge // functionality that invokes codeSnippet() was cppu::throwException(). @@ -211,7 +211,7 @@ void lo_mobile_throwException(css::uno::Any const& aException) assert(false); } -#endif // defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK) +#endif // defined(IOS) || (defined(__aarch64__) && defined(ANDROID)) } // anonymous namespace @@ -229,7 +229,7 @@ void SAL_CALL throwException( Any const & exc ) "(must be derived from com::sun::star::uno::Exception)!" ); } -#if defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK) +#if defined(IOS) || (defined(__aarch64__) && defined(ANDROID)) lo_mobile_throwException(exc); #else Mapping uno2cpp(Environment(UNO_LB_UNO), Environment::getCurrent()); @@ -252,7 +252,7 @@ void SAL_CALL throwException( Any const & exc ) Any SAL_CALL getCaughtException() { -#if defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK +#if defined(__aarch64__) && defined(ANDROID) // FIXME This stuff works on 32bit ARM, let's use the shortcut only for // the 64bit ARM. return Any(); |