strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

android: Actually let's avoid the exceptions via bridges only on aarch4.

Browse source 
Change-Id: Id2830f09ca6afd11f6f866565f37bdb7ba45bfb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84205
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
Jan Holesovsky 2019-12-02 11:32:45 +01:00 committed by Andras Timar
parent 2c86f1981c
commit f2f8a2ec10
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cppuhelper/source/exc_thrower.cxx
View file

@ -173,7 +173,7 @@ ExceptionThrower::ExceptionThrower()
class theExceptionThrower : public rtl::Static<ExceptionThrower, theExceptionThrower> {};
#if defined(IOS) || HAVE_FEATURE_ANDROID_LOK
#if defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK)
// 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) || HAVE_FEATURE_ANDROID_LOK
#endif // defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK)
} // 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) || HAVE_FEATURE_ANDROID_LOK
#if defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK)
lo_mobile_throwException(exc);
#else
Mapping uno2cpp(Environment(UNO_LB_UNO), Environment::getCurrent());
@ -252,7 +252,9 @@ void SAL_CALL throwException( Any const & exc )
Any SAL_CALL getCaughtException()
{
#if HAVE_FEATURE_ANDROID_LOK
#if defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK
// FIXME This stuff works on 32bit ARM, let's use the shortcut only for
// the 64bit ARM.
return Any();
#else
Mapping cpp2uno(Environment::getCurrent(), Environment(UNO_LB_UNO));