summaryrefslogtreecommitdiff
path: root/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 3464ad7c3d39..c3033fb49a2a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -266,8 +266,9 @@ namespace CPPU_CURRENT_NAMESPACE
return header->adjustedPtr;
}
- void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno)
{
+ __cxa_exception * header = __cxa_get_globals()->caughtExceptions;
if (! header)
{
RuntimeException aRE( "no exception header!" );
@@ -277,8 +278,10 @@ namespace CPPU_CURRENT_NAMESPACE
return;
}
+ std::type_info *exceptionType = __cxa_current_exception_type();
+
typelib_TypeDescription * pExcTypeDescr = 0;
- 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() );