diff options
| -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(); |