diff options
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx | 5 | ||||
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx | 2 | ||||
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx index da22eb436b8f..477879f2f2a0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx @@ -224,10 +224,11 @@ StructKind getStructKind(typelib_CompoundTypeDescription const * type) { namespace abi_aarch64 { void mapException( - __cxa_exception * exception, uno_Any * any, uno_Mapping * mapping) + __cxa_exception * exception, std::type_info const * type, uno_Any * any, uno_Mapping * mapping) { assert(exception != 0); - OUString unoName(toUnoName(exception->exceptionType->name())); + assert(type != nullptr); + OUString unoName(toUnoName(type->name())); typelib_TypeDescription * td = 0; typelib_typedescription_getByName(&td, unoName.pData); if (td == 0) { diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx index 2e3ce61caee9..d910b454b04f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx @@ -70,7 +70,7 @@ struct __cxa_eh_globals }; void mapException( - __cxa_exception * exception, uno_Any * any, uno_Mapping * mapping); + __cxa_exception * exception, std::type_info const * type, uno_Any * any, uno_Mapping * mapping); void raiseException(uno_Any * any, uno_Mapping * mapping); diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx index 8faccbf3edaf..32a19de020b1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx @@ -192,7 +192,8 @@ void call( abi_aarch64::mapException( reinterpret_cast<abi_aarch64::__cxa_eh_globals *>( __cxxabiv1::__cxa_get_globals())->caughtExceptions, - *exception, proxy->getBridge()->getCpp2Uno()); + __cxxabiv1::__cxa_current_exception_type(), *exception, + proxy->getBridge()->getCpp2Uno()); for (sal_Int32 i = 0; i != count; ++i) { if (cppArgs[i] != 0) { uno_destructData( |