diff options
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx index 27d6bc1a2cbe..9145071519ce 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx @@ -241,13 +241,16 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) +void fillUnoException(uno_Any * pExc, uno_Mapping * pCpp2Uno) { + __cxa_exception * header = __cxa_get_globals()->caughtExceptions; if (! header) terminate(); + std::type_info *exceptionType = __cxa_current_exception_type(); + typelib_TypeDescription * pExcTypeDescr = 0; - OUString unoName( toUNOname( header->exceptionType->name() ) ); + OUString unoName( toUNOname( exceptionType->name() ) ); ::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (! pExcTypeDescr) terminate(); |