diff options
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_intel/except.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index b06bd4b28f35..108c5c843744 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -265,8 +265,10 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException ); } -void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) +void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno) { + __cxa_exception * header = reinterpret_cast<CPPU_CURRENT_NAMESPACE::__cxa_eh_globals*>( + __cxxabiv1::__cxa_get_globals())->caughtExceptions; if (! header) { RuntimeException aRE( "no exception header!" ); @@ -276,8 +278,10 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping return; } + std::type_info *exceptionType = __cxxabiv1::__cxa_current_exception_type(); + typelib_TypeDescription * pExcTypeDescr = nullptr; - OUString unoName( toUNOname( header->exceptionType->name() ) ); + OUString unoName( toUNOname( exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); |