diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-03-03 13:14:00 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-03-03 13:14:00 +0100 |
| commit | 9a832a9bdbda66a0c3bfec2ce3eb7ba5bcc2eb44 (patch) | |
| tree | d46a12c5bddebed0f132c2d5017eeb54141c3cee /stoc | |
| parent | 92e5a45bfaba1b24905c4c22af67e59941e63cda (diff) | |
| parent | e3e1a6da8047cb36de9a8faf592a69c9a482a5d9 (diff) | |
CWS-TOOLING: integrate CWS sb119
Notes
Notes:
split repo tag: ure_ooo/DEV300_m74
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/invocation_adapterfactory/iafactory.cxx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index a2d8c6063881..2fda1819f891 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -766,27 +766,28 @@ FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext ) ::getCppuType( (const Sequence< sal_Int16 > *)0 ); rShortSeqType.getDescription( &m_pShortSeqTD ); // script.XInvocation - typelib_InterfaceTypeDescription * pTD = 0; + typelib_TypeDescription * pTD = 0; const Type & rInvType = ::getCppuType( (const Reference< script::XInvocation > *)0 ); - TYPELIB_DANGER_GET( - (typelib_TypeDescription **)&pTD, rInvType.getTypeLibType() ); - if( ! pTD->aBase.bComplete ) - typelib_typedescription_complete( (typelib_TypeDescription **)&pTD ); + TYPELIB_DANGER_GET( &pTD, rInvType.getTypeLibType() ); + typelib_InterfaceTypeDescription * pITD; + pITD = reinterpret_cast<typelib_InterfaceTypeDescription*>(pTD); + if( ! pITD->aBase.bComplete ) + typelib_typedescription_complete( &pTD ); ::typelib_typedescriptionreference_getDescription( - &m_pInvokMethodTD, pTD->ppMembers[ 1 ] ); // invoke() + &m_pInvokMethodTD, pITD->ppMembers[ 1 ] ); // invoke() ::typelib_typedescriptionreference_getDescription( - &m_pSetValueTD, pTD->ppMembers[ 2 ] ); // setValue() + &m_pSetValueTD, pITD->ppMembers[ 2 ] ); // setValue() ::typelib_typedescriptionreference_getDescription( - &m_pGetValueTD, pTD->ppMembers[ 3 ] ); // getValue() + &m_pGetValueTD, pITD->ppMembers[ 3 ] ); // getValue() // script.XTypeConverter const Type & rTCType = ::getCppuType( (const Reference< script::XTypeConverter > *)0 ); - TYPELIB_DANGER_GET( - (typelib_TypeDescription **)&pTD, rTCType.getTypeLibType() ); + TYPELIB_DANGER_GET( &pTD, rTCType.getTypeLibType() ); + pITD = reinterpret_cast<typelib_InterfaceTypeDescription*>(pTD); ::typelib_typedescriptionreference_getDescription( - &m_pConvertToTD, pTD->ppMembers[ 0 ] ); // convertTo() - TYPELIB_DANGER_RELEASE( (typelib_TypeDescription *)pTD ); + &m_pConvertToTD, pITD->ppMembers[ 0 ] ); // convertTo() + TYPELIB_DANGER_RELEASE( pTD ); if (!m_pInvokMethodTD || !m_pSetValueTD || !m_pGetValueTD || !m_pConvertToTD || |