Kaydet (Commit) 0122cd3a authored tarafından Caolán McNamara's avatar Caolán McNamara

fix mangled indent

üst 58f3e365
...@@ -237,37 +237,36 @@ namespace CPPU_CURRENT_NAMESPACE ...@@ -237,37 +237,36 @@ namespace CPPU_CURRENT_NAMESPACE
type_info * rtti; type_info * rtti;
{ {
// construct cpp exception object // construct cpp exception object
typelib_TypeDescription * pTypeDescr = 0; typelib_TypeDescription * pTypeDescr = 0;
TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType ); TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
OSL_ASSERT( pTypeDescr ); OSL_ASSERT( pTypeDescr );
if (! pTypeDescr) if (! pTypeDescr)
{ {
throw RuntimeException( throw RuntimeException(
OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() ); Reference< XInterface >() );
} }
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
// destruct uno exception // destruct uno exception
::uno_any_destruct( pUnoExc, 0 ); ::uno_any_destruct( pUnoExc, 0 );
rtti = (type_info *)RTTISingleton::get().getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr ); rtti = (type_info *)RTTISingleton::get().getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
TYPELIB_DANGER_RELEASE( pTypeDescr ); TYPELIB_DANGER_RELEASE( pTypeDescr );
OSL_ENSURE( rtti, "### no rtti for throwing exception!" ); OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
if (! rtti) if (! rtti)
{ {
throw RuntimeException( throw RuntimeException(
OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() ); Reference< XInterface >() );
} }
} }
__cxa_throw( pCppExc, rtti, deleteException );
__cxa_throw( pCppExc, rtti, deleteException );
} }
#ifdef __ARM_EABI__ #ifdef __ARM_EABI__
......
...@@ -53,8 +53,8 @@ namespace CPPU_CURRENT_NAMESPACE ...@@ -53,8 +53,8 @@ namespace CPPU_CURRENT_NAMESPACE
int handlerCount; int handlerCount;
#ifdef __ARM_EABI__ #ifdef __ARM_EABI__
__cxa_exception *nextPropagatingException; __cxa_exception *nextPropagatingException;
int propagationCount; int propagationCount;
#else #else
int handlerSwitchValue; int handlerSwitchValue;
const unsigned char *actionRecord; const unsigned char *actionRecord;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment