mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove visual noise from bridges

Browse Source 
Change-Id: I53fa23d335ff62795f09f9838d4064cea71aeb65
Reviewed-on: https://gerrit.libreoffice.org/8237
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Alexander Wilms 2014-02-25 17:44:54 +01:00 committed by Caolán McNamara
parent 875129a8d4
commit 6660b9d2c5
102 changed files with 87 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
bridges/inc/bridges/cpp_uno/bridge.hxx
View File

@ -30,7 +30,7 @@
namespace CPPU_CURRENT_NAMESPACE namespace CPPU_CURRENT_NAMESPACE
{ {
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_cppInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy ) SAL_THROW(()) inline void SAL_CALL cppu_cppInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy ) SAL_THROW(())
{ {
cppu_cppInterfaceProxy * pThis = cppu_cppInterfaceProxy * pThis =
@ -48,7 +48,7 @@ inline void SAL_CALL cppu_cppInterfaceProxy_free( uno_ExtEnvironment * pEnv, voi
#endif #endif
delete pThis; delete pThis;
} }
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_Mapping_uno2cpp( inline void SAL_CALL cppu_Mapping_uno2cpp(
uno_Mapping * pMapping, void ** ppCppI, uno_Mapping * pMapping, void ** ppCppI,
void * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW(()) void * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW(())
@ -90,7 +90,7 @@ inline void SAL_CALL cppu_Mapping_uno2cpp(
::rtl_uString_release( pOId ); ::rtl_uString_release( pOId );
} }
} }
//__________________________________________________________________________________________________
inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW(()) inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW(())
{ {
if (1 == osl_atomic_increment( &nRef )) if (1 == osl_atomic_increment( &nRef ))
@ -104,7 +104,7 @@ inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW(())
OSL_ASSERT( pThis == static_cast< ::com::sun::star::uno::XInterface * >( this ) ); OSL_ASSERT( pThis == static_cast< ::com::sun::star::uno::XInterface * >( this ) );
} }
} }
//__________________________________________________________________________________________________
inline void cppu_cppInterfaceProxy::releaseProxy() SAL_THROW(()) inline void cppu_cppInterfaceProxy::releaseProxy() SAL_THROW(())
{ {
if (! osl_atomic_decrement( &nRef )) // last release if (! osl_atomic_decrement( &nRef )) // last release
@ -114,7 +114,7 @@ inline void cppu_cppInterfaceProxy::releaseProxy() SAL_THROW(())
pBridge->pCppEnv, static_cast< ::com::sun::star::uno::XInterface * >( this ) ); pBridge->pCppEnv, static_cast< ::com::sun::star::uno::XInterface * >( this ) );
} }
} }
//__________________________________________________________________________________________________
inline cppu_cppInterfaceProxy::cppu_cppInterfaceProxy( inline cppu_cppInterfaceProxy::cppu_cppInterfaceProxy(
cppu_Bridge * pBridge_, uno_Interface * pUnoI_, cppu_Bridge * pBridge_, uno_Interface * pUnoI_,
typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ ) SAL_THROW(()) typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ ) SAL_THROW(())
@ -135,12 +135,12 @@ inline cppu_cppInterfaceProxy::cppu_cppInterfaceProxy(
} }
//##################################################################################################
//##################################################################################################
//##################################################################################################
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy ) SAL_THROW(()) inline void SAL_CALL cppu_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy ) SAL_THROW(())
{ {
cppu_unoInterfaceProxy * pThis = cppu_unoInterfaceProxy * pThis =
@ -158,7 +158,7 @@ inline void SAL_CALL cppu_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, voi
#endif #endif
delete pThis; delete pThis;
} }
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_unoInterfaceProxy_acquire( uno_Interface * pUnoI ) SAL_THROW(()) inline void SAL_CALL cppu_unoInterfaceProxy_acquire( uno_Interface * pUnoI ) SAL_THROW(())
{ {
if (1 == osl_atomic_increment( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef )) if (1 == osl_atomic_increment( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef ))
@ -179,7 +179,7 @@ inline void SAL_CALL cppu_unoInterfaceProxy_acquire( uno_Interface * pUnoI ) SAL
#endif #endif
} }
} }
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_unoInterfaceProxy_release( uno_Interface * pUnoI ) SAL_THROW(()) inline void SAL_CALL cppu_unoInterfaceProxy_release( uno_Interface * pUnoI ) SAL_THROW(())
{ {
if (! osl_atomic_decrement( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef )) if (! osl_atomic_decrement( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef ))
@ -189,7 +189,7 @@ inline void SAL_CALL cppu_unoInterfaceProxy_release( uno_Interface * pUnoI ) SAL
static_cast< cppu_unoInterfaceProxy * >( pUnoI )->pBridge->pUnoEnv, pUnoI ); static_cast< cppu_unoInterfaceProxy * >( pUnoI )->pBridge->pUnoEnv, pUnoI );
} }
} }
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_Mapping_cpp2uno( inline void SAL_CALL cppu_Mapping_cpp2uno(
uno_Mapping * pMapping, void ** ppUnoI, uno_Mapping * pMapping, void ** ppUnoI,
void * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW(()) void * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW(())
@ -231,7 +231,7 @@ inline void SAL_CALL cppu_Mapping_cpp2uno(
::rtl_uString_release( pOId ); ::rtl_uString_release( pOId );
} }
} }
//__________________________________________________________________________________________________
inline cppu_unoInterfaceProxy::cppu_unoInterfaceProxy( inline cppu_unoInterfaceProxy::cppu_unoInterfaceProxy(
cppu_Bridge * pBridge_, ::com::sun::star::uno::XInterface * pCppI_, cppu_Bridge * pBridge_, ::com::sun::star::uno::XInterface * pCppI_,
typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ ) SAL_THROW(()) typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ ) SAL_THROW(())
@ -257,22 +257,22 @@ inline cppu_unoInterfaceProxy::cppu_unoInterfaceProxy(
} }
//##################################################################################################
//##################################################################################################
//##################################################################################################
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_Mapping_acquire( uno_Mapping * pMapping ) SAL_THROW(()) inline void SAL_CALL cppu_Mapping_acquire( uno_Mapping * pMapping ) SAL_THROW(())
{ {
static_cast< cppu_Mapping * >( pMapping )->pBridge->acquire(); static_cast< cppu_Mapping * >( pMapping )->pBridge->acquire();
} }
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_Mapping_release( uno_Mapping * pMapping ) SAL_THROW(()) inline void SAL_CALL cppu_Mapping_release( uno_Mapping * pMapping ) SAL_THROW(())
{ {
static_cast< cppu_Mapping * >( pMapping )->pBridge->release(); static_cast< cppu_Mapping * >( pMapping )->pBridge->release();
} }
//__________________________________________________________________________________________________
inline cppu_Bridge::cppu_Bridge( inline cppu_Bridge::cppu_Bridge(
uno_ExtEnvironment * pCppEnv_, uno_ExtEnvironment * pUnoEnv_, uno_ExtEnvironment * pCppEnv_, uno_ExtEnvironment * pUnoEnv_,
sal_Bool bExportCpp2Uno_ ) SAL_THROW(()) sal_Bool bExportCpp2Uno_ ) SAL_THROW(())
@ -294,18 +294,18 @@ inline cppu_Bridge::cppu_Bridge(
(*((uno_Environment *)pCppEnv)->acquire)( (uno_Environment *)pCppEnv ); (*((uno_Environment *)pCppEnv)->acquire)( (uno_Environment *)pCppEnv );
(*((uno_Environment *)pUnoEnv)->acquire)( (uno_Environment *)pUnoEnv ); (*((uno_Environment *)pUnoEnv)->acquire)( (uno_Environment *)pUnoEnv );
} }
//__________________________________________________________________________________________________
inline cppu_Bridge::~cppu_Bridge() SAL_THROW(()) inline cppu_Bridge::~cppu_Bridge() SAL_THROW(())
{ {
(*((uno_Environment *)pUnoEnv)->release)( (uno_Environment *)pUnoEnv ); (*((uno_Environment *)pUnoEnv)->release)( (uno_Environment *)pUnoEnv );
(*((uno_Environment *)pCppEnv)->release)( (uno_Environment *)pCppEnv ); (*((uno_Environment *)pCppEnv)->release)( (uno_Environment *)pCppEnv );
} }
//__________________________________________________________________________________________________
inline void SAL_CALL cppu_Bridge_free( uno_Mapping * pMapping ) SAL_THROW(()) inline void SAL_CALL cppu_Bridge_free( uno_Mapping * pMapping ) SAL_THROW(())
{ {
delete static_cast< cppu_Mapping * >( pMapping )->pBridge; delete static_cast< cppu_Mapping * >( pMapping )->pBridge;
} }
//__________________________________________________________________________________________________
inline void cppu_Bridge::acquire() SAL_THROW(()) inline void cppu_Bridge::acquire() SAL_THROW(())
{ {
if (1 == osl_atomic_increment( &nRef )) if (1 == osl_atomic_increment( &nRef ))
@ -326,7 +326,7 @@ inline void cppu_Bridge::acquire() SAL_THROW(())
} }
} }
} }
//__________________________________________________________________________________________________
inline void cppu_Bridge::release() SAL_THROW(()) inline void cppu_Bridge::release() SAL_THROW(())
{ {
if (! osl_atomic_decrement( &nRef )) if (! osl_atomic_decrement( &nRef ))
@ -335,7 +335,7 @@ inline void cppu_Bridge::release() SAL_THROW(())
} }
} }
//##################################################################################################
inline void SAL_CALL cppu_ext_getMapping( inline void SAL_CALL cppu_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) SAL_THROW(()) uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) SAL_THROW(())
{ {
@ -375,12 +375,12 @@ inline void SAL_CALL cppu_ext_getMapping(
} }
//##################################################################################################
//##################################################################################################
//##################################################################################################
// environment init stuff // environment init stuff
//--------------------------------------------------------------------------------------------------
inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(()) inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
{ {
static OUString * s_pStaticOidPart = 0; static OUString * s_pStaticOidPart = 0;
@ -405,7 +405,7 @@ inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
return *s_pStaticOidPart; return *s_pStaticOidPart;
} }
// functions set at environment init // functions set at environment init
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_cppenv_computeObjectIdentifier( inline void SAL_CALL cppu_cppenv_computeObjectIdentifier(
uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ) SAL_THROW(()) uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ) SAL_THROW(())
{ {
@ -448,19 +448,19 @@ inline void SAL_CALL cppu_cppenv_computeObjectIdentifier(
} }
} }
} }
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_cppenv_acquireInterface( uno_ExtEnvironment *, void * pCppI ) SAL_THROW(()) inline void SAL_CALL cppu_cppenv_acquireInterface( uno_ExtEnvironment *, void * pCppI ) SAL_THROW(())
{ {
reinterpret_cast< ::com::sun::star::uno::XInterface * >( pCppI )->acquire(); reinterpret_cast< ::com::sun::star::uno::XInterface * >( pCppI )->acquire();
} }
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_cppenv_releaseInterface( uno_ExtEnvironment *, void * pCppI ) SAL_THROW(()) inline void SAL_CALL cppu_cppenv_releaseInterface( uno_ExtEnvironment *, void * pCppI ) SAL_THROW(())
{ {
reinterpret_cast< ::com::sun::star::uno::XInterface * >( pCppI )->release(); reinterpret_cast< ::com::sun::star::uno::XInterface * >( pCppI )->release();
} }
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_cppenv_environmentDisposing( uno_Environment * ) SAL_THROW(()) {} inline void SAL_CALL cppu_cppenv_environmentDisposing( uno_Environment * ) SAL_THROW(()) {}
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_cppenv_initEnvironment( uno_Environment * pCppEnv ) SAL_THROW(()) inline void SAL_CALL cppu_cppenv_initEnvironment( uno_Environment * pCppEnv ) SAL_THROW(())
{ {
OSL_ENSURE( pCppEnv->pExtEnv, "### expected extended environment!" ); OSL_ENSURE( pCppEnv->pExtEnv, "### expected extended environment!" );

6
bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
View File

@ -35,7 +35,7 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
static typelib_TypeClass cpp2uno_call( static typelib_TypeClass cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -303,7 +303,7 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nFunctionIndex,
sal_Int32 nVtableOffset, sal_Int32 nVtableOffset,
@ -434,7 +434,7 @@ static typelib_TypeClass cpp_mediate(
return eRet; return eRet;
} }
//==================================================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

8
bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
View File

@ -50,7 +50,7 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#ifdef DEBUG #ifdef DEBUG
@ -88,7 +88,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -209,7 +209,7 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
void * pCppExc; void * pCppExc;
@ -253,7 +253,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
{ {
OSL_ENSURE( header, "### no exception header!!!" ); OSL_ENSURE( header, "### no exception header!!!" );

4
bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
View File

@ -72,12 +72,10 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

2
bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
View File

@ -162,7 +162,7 @@ static void callVirtualMethod(
INSERT_INT32(pSV, pDS) \ INSERT_INT32(pSV, pDS) \
INSERT_INT32(((sal_uInt32*)pSV)+1, pDS) \ INSERT_INT32(((sal_uInt32*)pSV)+1, pDS) \
} }
//==================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

2
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
View File

@ -291,7 +291,6 @@ namespace
} }
//=====================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
void ** pCallStack, void ** pCallStack,
@ -428,7 +427,6 @@ namespace
} }
} }
//=======================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

2
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
View File

@ -299,7 +299,6 @@ namespace
} }
//=====================================================================
static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex,
sal_Int32 nVtableOffset, sal_Int32 nVtableOffset,
void ** pCallStack, void ** pCallStack,
@ -422,7 +421,6 @@ namespace
} }
} }
//=======================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

2
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
View File

@ -51,7 +51,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
void cpp2uno_call( void cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -231,7 +230,6 @@ void cpp2uno_call(
} }
//==================================================================================================
extern "C" void cpp_vtable_call( extern "C" void cpp_vtable_call(
int nFunctionIndex, int nVtableOffset, void** pCallStack, int nFunctionIndex, int nVtableOffset, void** pCallStack,
void * pReturnValue ) void * pReturnValue )

3
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
View File

@ -160,7 +160,6 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
namespace namespace
{ {
//================================================================
void callVirtualMethod( void callVirtualMethod(
void * pThis, void * pThis,
@ -327,7 +326,7 @@ void callVirtualMethod(
*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
namespace { namespace {
//=======================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

3
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
View File

@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
// The call instruction within the asm section of callVirtualMethod may throw // The call instruction within the asm section of callVirtualMethod may throw
// exceptions. So that the compiler handles this correctly, it is important // exceptions. So that the compiler handles this correctly, it is important
// that (a) callVirtualMethod might call dummy_can_throw_anything (although this // that (a) callVirtualMethod might call dummy_can_throw_anything (although this
@ -148,7 +147,6 @@ void callVirtualMethod(
} }
} }
//==================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@ -358,7 +356,6 @@ bool isSimpleReturnType(typelib_TypeDescription * pTD, bool recursive)
} }
} }
//==================================================================================================
namespace bridges { namespace cpp_uno { namespace shared { namespace bridges { namespace cpp_uno { namespace shared {
void unoInterfaceProxyDispatch( void unoInterfaceProxyDispatch(

1
bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
View File

@ -326,7 +326,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//============================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_uInt64 nOffsetAndIndex, sal_uInt64 nOffsetAndIndex,
void ** gpreg, void ** fpreg, void ** ovrflw, void ** gpreg, void ** fpreg, void ** ovrflw,

4
bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
View File

@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -210,7 +208,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
void * pCppExc; void * pCppExc;
@ -254,7 +251,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
{ {
OSL_ENSURE( header, "### no exception header!!!" ); OSL_ENSURE( header, "### no exception header!!!" );

3
bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
View File

@ -72,12 +72,9 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

3
bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
View File

@ -121,7 +121,7 @@ void MapReturn(long r0, typelib_TypeClass eTypeClass, sal_uInt64* pRegisterRetur
namespace namespace
{ {
//==================================================================================================
void callVirtualMethod( void callVirtualMethod(
void * pThis, sal_Int32 nVtableIndex, void * pThis, sal_Int32 nVtableIndex,
void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr,
@ -192,7 +192,6 @@ void callVirtualMethod(
} }
//============================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

2
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
View File

@ -284,7 +284,6 @@ namespace
} }
//=====================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
void ** pCallStack, void ** pCallStack,
@ -425,7 +424,6 @@ namespace
} }
} }
//=======================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

4
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
View File

@ -51,7 +51,6 @@ namespace CPPU_CURRENT_NAMESPACE
{ {
} }
//===================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -89,7 +88,6 @@ namespace CPPU_CURRENT_NAMESPACE
#endif #endif
} }
//=====================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -235,7 +233,6 @@ namespace CPPU_CURRENT_NAMESPACE
} }
} }
//==================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -308,7 +305,6 @@ namespace CPPU_CURRENT_NAMESPACE
} }
#endif #endif
//===================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

3
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
View File

@ -72,12 +72,9 @@ namespace CPPU_CURRENT_NAMESPACE
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//====================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//====================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

3
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
View File

@ -210,7 +210,6 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
namespace namespace
{ {
//================================================================
void callVirtualMethod( void callVirtualMethod(
void * pThis, void * pThis,
@ -377,7 +376,7 @@ void callVirtualMethod(
*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
namespace { namespace {
//=======================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

2
bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
View File

@ -366,7 +366,6 @@ namespace
} }
//=====================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
void ** gpreg, double* fpreg, void ** gpreg, double* fpreg,
@ -531,7 +530,6 @@ namespace
} }
} }
//=======================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

4
bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
View File

@ -51,7 +51,6 @@ namespace CPPU_CURRENT_NAMESPACE
{ {
} }
//===================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -89,7 +88,6 @@ namespace CPPU_CURRENT_NAMESPACE
#endif #endif
} }
//=====================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -211,7 +209,6 @@ namespace CPPU_CURRENT_NAMESPACE
} }
} }
//==================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -278,7 +275,6 @@ namespace CPPU_CURRENT_NAMESPACE
return header->adjustedPtr; return header->adjustedPtr;
} }
//===================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

4
bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
View File

@ -72,12 +72,10 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

2
bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
View File

@ -168,7 +168,7 @@ namespace hppa
namespace { namespace {
//=======================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

3
bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
View File

@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
static typelib_TypeClass cpp2uno_call( static typelib_TypeClass cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -303,7 +303,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_uInt64 nOffsetAndIndex, sal_uInt64 nOffsetAndIndex,
void ** gpreg, void ** fpreg, long sp, long r8, void ** gpreg, void ** fpreg, long sp, long r8,

4
bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
View File

@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -210,7 +208,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
void * pCppExc; void * pCppExc;
@ -254,7 +251,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
{ {
OSL_ENSURE( header, "### no exception header!!!" ); OSL_ENSURE( header, "### no exception header!!!" );

4
bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
View File

@ -73,12 +73,10 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

3
bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
View File

@ -149,7 +149,7 @@ namespace ia64
namespace namespace
{ {
//==================================================================================================
static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn, void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pStack, sal_uInt32 nStack,
@ -296,7 +296,6 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
if (bOverFlow) \ if (bOverFlow) \
*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
//==================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

3
bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
View File

@ -35,7 +35,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
void cpp2uno_call( void cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -213,7 +212,6 @@ void cpp2uno_call(
} }
//==================================================================================================
extern "C" void cpp_vtable_call( extern "C" void cpp_vtable_call(
int nFunctionIndex, int nVtableOffset, void** pCallStack, int nFunctionIndex, int nVtableOffset, void** pCallStack,
void * pReturnValue ) void * pReturnValue )
@ -337,7 +335,6 @@ extern "C" void cpp_vtable_call(
} }
} }
//==================================================================================================
extern "C" void privateSnippetExecutorGeneral(); extern "C" void privateSnippetExecutorGeneral();
extern "C" void privateSnippetExecutorVoid(); extern "C" void privateSnippetExecutorVoid();
extern "C" void privateSnippetExecutorHyper(); extern "C" void privateSnippetExecutorHyper();

4
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
View File

@ -47,7 +47,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -85,7 +84,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -217,7 +215,6 @@ static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -278,7 +275,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException ); __cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

3
bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
View File

@ -108,10 +108,9 @@ extern "C" void __cxa_throw(
namespace CPPU_CURRENT_NAMESPACE namespace CPPU_CURRENT_NAMESPACE
{ {
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );

2
bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
View File

@ -261,7 +261,6 @@ namespace
} }
//=====================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
long sp, long r8, long sp, long r8,
@ -399,7 +398,6 @@ namespace
} }
} }
//=======================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

4
bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
View File

@ -51,7 +51,6 @@ namespace CPPU_CURRENT_NAMESPACE
{ {
} }
//===================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -89,7 +88,6 @@ namespace CPPU_CURRENT_NAMESPACE
#endif #endif
} }
//=====================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -211,7 +209,6 @@ namespace CPPU_CURRENT_NAMESPACE
} }
} }
//==================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -278,7 +275,6 @@ namespace CPPU_CURRENT_NAMESPACE
return header->adjustedPtr; return header->adjustedPtr;
} }
//===================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

4
bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
View File

@ -72,12 +72,10 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

3
bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
View File

@ -70,7 +70,6 @@ void MapReturn(long d0, long d1, typelib_TypeClass eReturnType, long *pRegisterR
namespace namespace
{ {
//================================================================
void callVirtualMethod( void callVirtualMethod(
void * pThis, void * pThis,
@ -150,7 +149,7 @@ void callVirtualMethod(
*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
namespace { namespace {
//=======================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

3
bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
View File

@ -62,7 +62,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
static typelib_TypeClass cpp2uno_call( static typelib_TypeClass cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -376,7 +375,6 @@ namespace
} }
//==================================================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nFunctionIndex,
sal_Int32 nVtableOffset, sal_Int32 nVtableOffset,
@ -546,7 +544,6 @@ namespace
return eRet; return eRet;
} }
//==================================================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

4
bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
View File

@ -48,7 +48,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if defined BRIDGES_DEBUG #if defined BRIDGES_DEBUG
@ -86,7 +85,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -208,7 +206,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if defined BRIDGES_DEBUG #if defined BRIDGES_DEBUG
@ -269,7 +266,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

4
bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
View File

@ -72,12 +72,10 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

5
bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
View File

@ -42,7 +42,6 @@ namespace
{ {
//==================================================================================================
static void callVirtualMethod( static void callVirtualMethod(
void * pAdjustedThisPtr, void * pAdjustedThisPtr,
sal_Int32 nVtableIndex, sal_Int32 nVtableIndex,
@ -98,7 +97,7 @@ namespace
// now we need to parse the entire signature string */ // now we need to parse the entire signature string */
// until we get the END indicator */ // until we get the END indicator */
// treat complex return pointer like any other parameter // // treat complex return pointer like any other parameter
#ifdef BRDEBUG #ifdef BRDEBUG
fprintf(stderr,"overflow area pointer p=%p\n",p); fprintf(stderr,"overflow area pointer p=%p\n",p);
@ -232,7 +231,6 @@ namespace
} }
//==================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@ -458,7 +456,6 @@ namespace
namespace bridges { namespace cpp_uno { namespace shared { namespace bridges { namespace cpp_uno { namespace shared {
//==================================================================================================
void unoInterfaceProxyDispatch( void unoInterfaceProxyDispatch(
uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
void * pReturn, void * pArgs[], uno_Any ** ppException ) void * pReturn, void * pArgs[], uno_Any ** ppException )

3
bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
View File

@ -349,7 +349,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nFunctionIndex,
sal_Int32 nVtableOffset, sal_Int32 nVtableOffset,
@ -485,7 +484,6 @@ static typelib_TypeClass cpp_mediate(
return eRet; return eRet;
} }
//==================================================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)
@ -631,7 +629,6 @@ unsigned char * codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal
// if no dedicated floating point registers are used than we have NULL // if no dedicated floating point registers are used than we have NULL
// pointer there // pointer there
// li r6, 0 // li r6, 0
//
// #now load up the pointer to the overflow call stack // #now load up the pointer to the overflow call stack
// addi r7,r1,8 // addi r7,r1,8

5
bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
View File

@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -210,7 +208,7 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
void * pCppExc; void * pCppExc;
@ -254,7 +252,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
{ {
OSL_ENSURE( header, "### no exception header!!!" ); OSL_ENSURE( header, "### no exception header!!!" );

4
bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
View File

@ -72,12 +72,10 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

4
bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
View File

@ -38,7 +38,6 @@ namespace
{ {
//==================================================================================================
static void callVirtualMethod( static void callVirtualMethod(
void * pAdjustedThisPtr, void * pAdjustedThisPtr,
sal_Int32 nVtableIndex, sal_Int32 nVtableIndex,
@ -114,7 +113,7 @@ static void callVirtualMethod(
// now we need to parse the entire signature string */ // now we need to parse the entire signature string */
// until we get the END indicator */ // until we get the END indicator */
// treat complex return pointer like any other parameter // // treat complex return pointer like any other parameter
#if 0 #if 0
/* Let's figure out what is really going on here*/ /* Let's figure out what is really going on here*/
@ -327,7 +326,6 @@ static void callVirtualMethod(
} }
//==================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

4
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
View File

@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
static typelib_TypeClass cpp2uno_call( static typelib_TypeClass cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -322,7 +322,7 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_uInt64 nOffsetAndIndex, sal_uInt64 nOffsetAndIndex,
void ** gpreg, void ** fpreg, long sp, void ** gpreg, void ** fpreg, long sp,

4
bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
View File

@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -210,7 +208,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
void * pCppExc; void * pCppExc;
@ -254,7 +251,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
{ {
OSL_ENSURE( header, "### no exception header!!!" ); OSL_ENSURE( header, "### no exception header!!!" );

4
bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
View File

@ -72,12 +72,10 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

3
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
View File

@ -72,7 +72,7 @@ void MapReturn(long r3, double dret, typelib_TypeClass eTypeClass, void *pRegist
namespace namespace
{ {
//==================================================================================================
static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr,
sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pStack, sal_uInt32 nStack,
@ -227,7 +227,6 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
if (bOverFlow) \ if (bOverFlow) \
*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
//==================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

2
bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
View File

@ -309,7 +309,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//============================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_uInt32 nOffsetAndIndex, sal_uInt32 nOffsetAndIndex,
void ** gpreg, void ** fpreg, void ** ovrflw, void ** gpreg, void ** fpreg, void ** ovrflw,
@ -450,7 +449,6 @@ static typelib_TypeClass cpp_mediate(
return eRet; return eRet;
} }
//==================================================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

4
bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
View File

@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -210,7 +208,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
void * pCppExc; void * pCppExc;
@ -254,7 +251,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
{ {
OSL_ENSURE( header, "### no exception header!!!" ); OSL_ENSURE( header, "### no exception header!!!" );

3
bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
View File

@ -72,12 +72,9 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

2
bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
View File

@ -166,7 +166,6 @@ invoke_copy_to_stack(sal_Int32 * pStackLongs, char * pPT, sal_Int32* d_ov, sal_I
} }
} }
//==================================================================================================
static void callVirtualMethod( static void callVirtualMethod(
void * pThis, void * pThis,
sal_Int32 nVtableIndex, sal_Int32 nVtableIndex,
@ -272,7 +271,6 @@ static void callVirtualMethod(
} }
//============================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

1
bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
View File

@ -311,7 +311,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//============================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_uInt64 nOffsetAndIndex, sal_uInt64 nOffsetAndIndex,
void ** gpreg, void ** fpreg, void ** ovrflw, void ** gpreg, void ** fpreg, void ** ovrflw,

4
bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
View File

@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -210,7 +208,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
void * pCppExc; void * pCppExc;
@ -254,7 +251,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
{ {
OSL_ENSURE( header, "### no exception header!!!" ); OSL_ENSURE( header, "### no exception header!!!" );

3
bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
View File

@ -72,12 +72,9 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

3
bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
View File

@ -118,7 +118,7 @@ void MapReturn(long r2, double f0, typelib_TypeClass eTypeClass, sal_uInt64* pRe
namespace namespace
{ {
//==================================================================================================
void callVirtualMethod( void callVirtualMethod(
void * pThis, sal_Int32 nVtableIndex, void * pThis, sal_Int32 nVtableIndex,
void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr,
@ -195,7 +195,6 @@ void callVirtualMethod(
} }
//============================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

4
bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
View File

@ -30,7 +30,7 @@ using namespace com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
static typelib_TypeClass cpp2uno_call( static typelib_TypeClass cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -217,7 +217,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nFunctionIndex,
sal_Int32 nVtableOffset, sal_Int32 nVtableOffset,
@ -349,7 +348,6 @@ static typelib_TypeClass cpp_mediate(
//==================================================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

4
bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
View File

@ -49,7 +49,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if defined BRIDGES_DEBUG #if defined BRIDGES_DEBUG
@ -87,7 +86,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -209,7 +207,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if defined BRIDGES_DEBUG #if defined BRIDGES_DEBUG
@ -270,7 +267,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

3
bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
View File

@ -66,10 +66,9 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );

2
bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
View File

@ -32,7 +32,6 @@ using namespace com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
// The call instruction within the asm section of callVirtualMethod may throw // The call instruction within the asm section of callVirtualMethod may throw
// exceptions. So that the compiler handles this correctly, it is important // exceptions. So that the compiler handles this correctly, it is important
// that (a) callVirtualMethod might call dummy_can_throw_anything (although this // that (a) callVirtualMethod might call dummy_can_throw_anything (although this
@ -271,7 +270,6 @@ void callVirtualMethod( void * pAdjustedThisPtr,
} }
} }
//=================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

10
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
View File

@ -42,7 +42,7 @@ using namespace ::osl;
using namespace ::rtl; using namespace ::rtl;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
//==================================================================================================
// Perform the UNO call // Perform the UNO call
// //
@ -252,7 +252,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
extern "C" typelib_TypeClass cpp_vtable_call( extern "C" typelib_TypeClass cpp_vtable_call(
sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
void ** gpreg, void ** fpreg, void ** ovrflw, void ** gpreg, void ** fpreg, void ** ovrflw,
@ -386,7 +385,6 @@ extern "C" typelib_TypeClass cpp_vtable_call(
return eRet; return eRet;
} }
//==================================================================================================
extern "C" void privateSnippetExecutor( ... ); extern "C" void privateSnippetExecutor( ... );
const int codeSnippetSize = 24; const int codeSnippetSize = 24;
@ -430,7 +428,6 @@ unsigned char * codeSnippet( unsigned char * code,
return code + codeSnippetSize; return code + codeSnippetSize;
} }
//==================================================================================================
struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; }; struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::Slot *
@ -439,14 +436,12 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2; return static_cast< Slot * >(block) + 2;
} }
//==================================================================================================
sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize( sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount) sal_Int32 slotCount)
{ {
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize; return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
} }
//==================================================================================================
bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::Slot *
bridges::cpp_uno::shared::VtableFactory::initializeBlock( bridges::cpp_uno::shared::VtableFactory::initializeBlock(
void * block, sal_Int32 slotCount) void * block, sal_Int32 slotCount)
@ -457,7 +452,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
return slots + slotCount; return slots + slotCount;
} }
//==================================================================================================
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
@ -507,7 +502,6 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
return code; return code;
} }
//==================================================================================================
void bridges::cpp_uno::shared::VtableFactory::flushCode( void bridges::cpp_uno::shared::VtableFactory::flushCode(
SAL_UNUSED_PARAMETER unsigned char const *, SAL_UNUSED_PARAMETER unsigned char const *,
SAL_UNUSED_PARAMETER unsigned char const * ) SAL_UNUSED_PARAMETER unsigned char const * )

4
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
View File

@ -49,7 +49,6 @@ using namespace ::__cxxabiv1;
namespace CPPU_CURRENT_NAMESPACE namespace CPPU_CURRENT_NAMESPACE
{ {
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -87,7 +86,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -224,7 +222,6 @@ namespace
struct theRTTI : public rtl::Static<RTTI, theRTTI> {}; struct theRTTI : public rtl::Static<RTTI, theRTTI> {};
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -272,7 +269,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException ); __cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

3
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
View File

@ -105,10 +105,9 @@ extern "C" void __cxa_throw(
namespace CPPU_CURRENT_NAMESPACE namespace CPPU_CURRENT_NAMESPACE
{ {
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

2
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
View File

@ -82,7 +82,6 @@ using namespace ::com::sun::star::uno;
else \ else \
*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
//==================================================================================================
namespace { namespace {
@ -309,7 +308,6 @@ static void cpp_call(
} }
} }
//==================================================================================================
namespace bridges { namespace cpp_uno { namespace shared { namespace bridges { namespace cpp_uno { namespace shared {

3
bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
View File

@ -39,7 +39,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
void cpp2uno_call( void cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -219,7 +218,6 @@ void cpp2uno_call(
} }
//==================================================================================================
extern "C" void cpp_vtable_call( extern "C" void cpp_vtable_call(
int nFunctionIndex, int nVtableOffset, void** pCallStack, int nFunctionIndex, int nVtableOffset, void** pCallStack,
void * pReturnValue ) void * pReturnValue )
@ -349,7 +347,6 @@ extern "C" void cpp_vtable_call(
} }
} }
//==================================================================================================
extern "C" void privateSnippetExecutorGeneral(); extern "C" void privateSnippetExecutorGeneral();
extern "C" void privateSnippetExecutorVoid(); extern "C" void privateSnippetExecutorVoid();
extern "C" void privateSnippetExecutorHyper(); extern "C" void privateSnippetExecutorHyper();

4
bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
View File

@ -121,7 +121,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -159,7 +158,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
@ -286,7 +284,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -347,7 +344,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

4
bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx
View File

@ -73,12 +73,10 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

3
bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
View File

@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
// The call instruction within the asm section of callVirtualMethod may throw // The call instruction within the asm section of callVirtualMethod may throw
// exceptions. So that the compiler handles this correctly, it is important // exceptions. So that the compiler handles this correctly, it is important
// that (a) callVirtualMethod might call dummy_can_throw_anything (although this // that (a) callVirtualMethod might call dummy_can_throw_anything (although this
@ -147,7 +146,6 @@ void callVirtualMethod(
} }
} }
//==================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@ -357,7 +355,6 @@ bool isSimpleReturnType(typelib_TypeDescription * pTD, bool recursive)
} }
} }
//==================================================================================================
namespace bridges { namespace cpp_uno { namespace shared { namespace bridges { namespace cpp_uno { namespace shared {
void unoInterfaceProxyDispatch( void unoInterfaceProxyDispatch(

2
bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
View File

@ -326,7 +326,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nFunctionIndex,
sal_Int32 nVtableOffset, sal_Int32 nVtableOffset,
@ -462,7 +461,6 @@ static typelib_TypeClass cpp_mediate(
return eRet; return eRet;
} }
//==================================================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

4
bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
View File

@ -49,7 +49,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -87,7 +86,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -209,7 +207,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
void * pCppExc; void * pCppExc;
@ -253,7 +250,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
{ {
OSL_ENSURE( header, "### no exception header!!!" ); OSL_ENSURE( header, "### no exception header!!!" );

4
bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx
View File

@ -72,12 +72,10 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

4
bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
View File

@ -39,7 +39,6 @@ namespace
{ {
//==================================================================================================
static void callVirtualMethod( static void callVirtualMethod(
void * pAdjustedThisPtr, void * pAdjustedThisPtr,
sal_Int32 nVtableIndex, sal_Int32 nVtableIndex,
@ -113,7 +112,7 @@ static void callVirtualMethod(
// now we need to parse the entire signature string */ // now we need to parse the entire signature string */
// until we get the END indicator */ // until we get the END indicator */
// treat complex return pointer like any other parameter // // treat complex return pointer like any other parameter
#if OSL_DEBUG_LEVEL > 2 #if OSL_DEBUG_LEVEL > 2
/* Let's figure out what is really going on here*/ /* Let's figure out what is really going on here*/
@ -302,7 +301,6 @@ static void callVirtualMethod(
} }
//==================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

9
bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
View File

@ -42,7 +42,6 @@ using namespace ::osl;
using namespace ::rtl; using namespace ::rtl;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
//==================================================================================================
// Perform the UNO call // Perform the UNO call
// //
@ -252,7 +251,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
extern "C" typelib_TypeClass cpp_vtable_call( extern "C" typelib_TypeClass cpp_vtable_call(
sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
void ** gpreg, void ** fpreg, void ** ovrflw, void ** gpreg, void ** fpreg, void ** ovrflw,
@ -386,7 +384,6 @@ extern "C" typelib_TypeClass cpp_vtable_call(
return eRet; return eRet;
} }
//==================================================================================================
extern "C" void privateSnippetExecutor(); extern "C" void privateSnippetExecutor();
const int codeSnippetSize = 24; const int codeSnippetSize = 24;
@ -430,7 +427,6 @@ unsigned char * codeSnippet( unsigned char * code,
return code + codeSnippetSize; return code + codeSnippetSize;
} }
//==================================================================================================
struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; }; struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::Slot *
@ -439,14 +435,12 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2; return static_cast< Slot * >(block) + 2;
} }
//==================================================================================================
sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize( sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount) sal_Int32 slotCount)
{ {
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize; return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
} }
//==================================================================================================
bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::Slot *
bridges::cpp_uno::shared::VtableFactory::initializeBlock( bridges::cpp_uno::shared::VtableFactory::initializeBlock(
void * block, sal_Int32 slotCount) void * block, sal_Int32 slotCount)
@ -457,7 +451,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
return slots + slotCount; return slots + slotCount;
} }
//==================================================================================================
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
@ -507,7 +501,6 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
return code; return code;
} }
//==================================================================================================
void bridges::cpp_uno::shared::VtableFactory::flushCode( void bridges::cpp_uno::shared::VtableFactory::flushCode(
SAL_UNUSED_PARAMETER unsigned char const *, SAL_UNUSED_PARAMETER unsigned char const *,
SAL_UNUSED_PARAMETER unsigned char const * ) SAL_UNUSED_PARAMETER unsigned char const * )

4
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
View File

@ -121,7 +121,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -159,7 +158,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
@ -286,7 +284,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -347,7 +344,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

4
bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
View File

@ -143,12 +143,10 @@ extern "C" void __cxa_throw (
void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
#endif #endif
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

2
bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
View File

@ -82,7 +82,6 @@ using namespace ::com::sun::star::uno;
else \ else \
*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
//==================================================================================================
namespace { namespace {
@ -306,7 +305,6 @@ static void cpp_call(
} }
} }
//==================================================================================================
namespace bridges { namespace cpp_uno { namespace shared { namespace bridges { namespace cpp_uno { namespace shared {

4
bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
View File

@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
static typelib_TypeClass cpp2uno_call( static typelib_TypeClass cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -219,7 +218,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nFunctionIndex,
sal_Int32 nVtableOffset, sal_Int32 nVtableOffset,
@ -351,7 +349,6 @@ static typelib_TypeClass cpp_mediate(
return eRet; return eRet;
} }
//==================================================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)
@ -399,7 +396,6 @@ void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
} }
//==================================================================================================
int const codeSnippetSize = 20; int const codeSnippetSize = 20;
unsigned char * codeSnippet( unsigned char * codeSnippet(

4
bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
View File

@ -51,7 +51,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -89,7 +88,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -211,7 +209,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -272,7 +269,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

4
bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
View File

@ -71,12 +71,10 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

2
bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
View File

@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
void callVirtualMethod( void callVirtualMethod(
void * pAdjustedThisPtr, void * pAdjustedThisPtr,
sal_Int32 nVtableIndex, sal_Int32 nVtableIndex,
@ -131,7 +130,6 @@ void callVirtualMethod(
} }
} }
//==================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

4
bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
View File

@ -31,7 +31,7 @@ using namespace com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
static typelib_TypeClass cpp2uno_call( static typelib_TypeClass cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -216,7 +216,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
static typelib_TypeClass cpp_mediate( static typelib_TypeClass cpp_mediate(
sal_Int32 nFunctionIndex, sal_Int32 nFunctionIndex,
sal_Int32 nVtableOffset, sal_Int32 nVtableOffset,
@ -348,7 +347,6 @@ static typelib_TypeClass cpp_mediate(
//==================================================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)

4
bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
View File

@ -48,7 +48,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if defined BRIDGES_DEBUG #if defined BRIDGES_DEBUG
@ -86,7 +85,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -208,7 +206,6 @@ static void deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if defined BRIDGES_DEBUG #if defined BRIDGES_DEBUG
@ -269,7 +266,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

3
bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
View File

@ -66,10 +66,9 @@ struct __cxa_eh_globals
}; };
extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );

2
bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
View File

@ -35,7 +35,6 @@ using namespace com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
// The call instruction within the asm section of callVirtualMethod may throw // The call instruction within the asm section of callVirtualMethod may throw
// exceptions. So that the compiler handles this correctly, it is important // exceptions. So that the compiler handles this correctly, it is important
// that (a) callVirtualMethod might call dummy_can_throw_anything (although this // that (a) callVirtualMethod might call dummy_can_throw_anything (although this
@ -266,7 +265,6 @@ void callVirtualMethod( void * pAdjustedThisPtr,
} }
} }
//=================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

3
bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
View File

@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
void cpp2uno_call( void cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -221,7 +220,6 @@ void cpp2uno_call(
} }
//==================================================================================================
extern "C" void cpp_vtable_call( extern "C" void cpp_vtable_call(
int nFunctionIndex, int nVtableOffset, void** pCallStack, int nFunctionIndex, int nVtableOffset, void** pCallStack,
void * pReturnValue ) void * pReturnValue )
@ -345,7 +343,6 @@ extern "C" void cpp_vtable_call(
} }
} }
//==================================================================================================
extern "C" void privateSnippetExecutorGeneral(); extern "C" void privateSnippetExecutorGeneral();
extern "C" void privateSnippetExecutorVoid(); extern "C" void privateSnippetExecutorVoid();
extern "C" void privateSnippetExecutorHyper(); extern "C" void privateSnippetExecutorHyper();

4
bridges/source/cpp_uno/mingw_intel/except.cxx
View File

@ -55,7 +55,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -93,7 +92,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -202,7 +200,6 @@ static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -263,7 +260,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

4
bridges/source/cpp_uno/mingw_intel/share.hxx
View File

@ -87,12 +87,10 @@ extern "C" void __cxa_throw (
void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
#endif #endif
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

8
bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
View File

@ -42,7 +42,6 @@ using namespace ::osl;
using namespace ::rtl; using namespace ::rtl;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
//==================================================================================================
// Perform the UNO call // Perform the UNO call
// //
@ -252,7 +251,6 @@ static typelib_TypeClass cpp2uno_call(
} }
//==================================================================================================
extern "C" typelib_TypeClass cpp_vtable_call( extern "C" typelib_TypeClass cpp_vtable_call(
sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
void ** gpreg, void ** fpreg, void ** ovrflw, void ** gpreg, void ** fpreg, void ** ovrflw,
@ -386,7 +384,6 @@ extern "C" typelib_TypeClass cpp_vtable_call(
return eRet; return eRet;
} }
//==================================================================================================
extern "C" void privateSnippetExecutor( ... ); extern "C" void privateSnippetExecutor( ... );
const int codeSnippetSize = 24; const int codeSnippetSize = 24;
@ -430,7 +427,6 @@ unsigned char * codeSnippet( unsigned char * code,
return code + codeSnippetSize; return code + codeSnippetSize;
} }
//==================================================================================================
struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; }; struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::Slot *
@ -439,14 +435,12 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2; return static_cast< Slot * >(block) + 2;
} }
//==================================================================================================
sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize( sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount) sal_Int32 slotCount)
{ {
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize; return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
} }
//==================================================================================================
bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::Slot *
bridges::cpp_uno::shared::VtableFactory::initializeBlock( bridges::cpp_uno::shared::VtableFactory::initializeBlock(
void * block, sal_Int32 slotCount) void * block, sal_Int32 slotCount)
@ -457,7 +451,6 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
return slots + slotCount; return slots + slotCount;
} }
//==================================================================================================
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
Slot ** slots, unsigned char * code, typelib_InterfaceTypeDescription const * type, Slot ** slots, unsigned char * code, typelib_InterfaceTypeDescription const * type,
@ -506,7 +499,6 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
return code; return code;
} }
//==================================================================================================
void bridges::cpp_uno::shared::VtableFactory::flushCode( void bridges::cpp_uno::shared::VtableFactory::flushCode(
SAL_UNUSED_PARAMETER unsigned char const *, SAL_UNUSED_PARAMETER unsigned char const *,
SAL_UNUSED_PARAMETER unsigned char const * ) SAL_UNUSED_PARAMETER unsigned char const * )

4
bridges/source/cpp_uno/mingw_x86-64/except.cxx
View File

@ -55,7 +55,6 @@ void dummy_can_throw_anything( char const * )
{ {
} }
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(()) static OUString toUNOname( char const * p ) SAL_THROW(())
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -93,7 +92,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(())
#endif #endif
} }
//==================================================================================================
class RTTI class RTTI
{ {
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
@ -202,7 +200,6 @@ static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
} }
} }
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@ -263,7 +260,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
__cxa_throw( pCppExc, rtti, deleteException ); __cxa_throw( pCppExc, rtti, deleteException );
} }
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {
if (! header) if (! header)

4
bridges/source/cpp_uno/mingw_x86-64/share.hxx
View File

@ -87,12 +87,10 @@ extern "C" void __cxa_throw (
void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
#endif #endif
// -----
//==================================================================================================
void raiseException( void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException( void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
} }

2
bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx
View File

@ -78,7 +78,6 @@ using namespace ::com::sun::star::uno;
else \ else \
*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
//==================================================================================================
namespace { namespace {
@ -302,7 +301,6 @@ static void cpp_call(
} }
} }
//==================================================================================================
namespace bridges { namespace cpp_uno { namespace shared { namespace bridges { namespace cpp_uno { namespace shared {

4
bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
View File

@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
static inline typelib_TypeClass cpp2uno_call( static inline typelib_TypeClass cpp2uno_call(
bridges::cpp_uno::shared::CppInterfaceProxy * pThis, bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
const typelib_TypeDescription * pMemberTypeDescr, const typelib_TypeDescription * pMemberTypeDescr,
@ -228,7 +227,6 @@ static inline typelib_TypeClass cpp2uno_call(
} }
} }
//==================================================================================================
static typelib_TypeClass __cdecl cpp_mediate( static typelib_TypeClass __cdecl cpp_mediate(
void ** pCallStack, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, void ** pCallStack, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
sal_Int64 * pRegisterReturn /* space for register return */ ) sal_Int64 * pRegisterReturn /* space for register return */ )
@ -348,7 +346,6 @@ static typelib_TypeClass __cdecl cpp_mediate(
return eRet; return eRet;
} }
//==================================================================================================
/** /**
* is called on incoming vtable calls * is called on incoming vtable calls
* (called by asm snippets) * (called by asm snippets)
@ -395,7 +392,6 @@ Ldouble:
} }
} }
//==================================================================================================
int const codeSnippetSize = 16; int const codeSnippetSize = 16;
unsigned char * codeSnippet( unsigned char * codeSnippet(

25
bridges/source/cpp_uno/msvc_win32_intel/except.cxx
View File

@ -44,7 +44,6 @@ using namespace ::rtl;
namespace CPPU_CURRENT_NAMESPACE namespace CPPU_CURRENT_NAMESPACE
{ {
//==================================================================================================
static inline OUString toUNOname( OUString const & rRTTIname ) throw () static inline OUString toUNOname( OUString const & rRTTIname ) throw ()
{ {
OUStringBuffer aRet( 64 ); OUStringBuffer aRet( 64 );
@ -62,7 +61,7 @@ static inline OUString toUNOname( OUString const & rRTTIname ) throw ()
} }
return aRet.makeStringAndClear(); return aRet.makeStringAndClear();
} }
//==================================================================================================
static inline OUString toRTTIname( OUString const & rUNOname ) throw () static inline OUString toRTTIname( OUString const & rUNOname ) throw ()
{ {
OUStringBuffer aRet( 64 ); OUStringBuffer aRet( 64 );
@ -80,14 +79,11 @@ static inline OUString toRTTIname( OUString const & rUNOname ) throw ()
} }
//##################################################################################################
//#### RTTI simulation ############################################################################# //#### RTTI simulation #############################################################################
//##################################################################################################
typedef boost::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap; typedef boost::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap;
//==================================================================================================
class RTTInfos class RTTInfos
{ {
Mutex _aMutex; Mutex _aMutex;
@ -101,7 +97,6 @@ public:
~RTTInfos(); ~RTTInfos();
}; };
//==================================================================================================
class __type_info class __type_info
{ {
friend type_info * RTTInfos::getRTTI( OUString const & ) throw (); friend type_info * RTTInfos::getRTTI( OUString const & ) throw ();
@ -174,12 +169,9 @@ RTTInfos::~RTTInfos() throw ()
} }
//##################################################################################################
//#### Exception raising ########################################################################### //#### Exception raising ###########################################################################
//##################################################################################################
//==================================================================================================
struct ObjectFunction struct ObjectFunction
{ {
char somecode[12]; char somecode[12];
@ -236,14 +228,13 @@ ObjectFunction::~ObjectFunction() throw ()
::typelib_typedescription_release( _pTypeDescr ); ::typelib_typedescription_release( _pTypeDescr );
} }
//==================================================================================================
static void * __cdecl __copyConstruct( void * pExcThis, void * pSource, ObjectFunction * pThis ) static void * __cdecl __copyConstruct( void * pExcThis, void * pSource, ObjectFunction * pThis )
throw () throw ()
{ {
::uno_copyData( pExcThis, pSource, pThis->_pTypeDescr, cpp_acquire ); ::uno_copyData( pExcThis, pSource, pThis->_pTypeDescr, cpp_acquire );
return pExcThis; return pExcThis;
} }
//==================================================================================================
static void * __cdecl __destruct( void * pExcThis, ObjectFunction * pThis ) static void * __cdecl __destruct( void * pExcThis, ObjectFunction * pThis )
throw () throw ()
{ {
@ -253,7 +244,6 @@ static void * __cdecl __destruct( void * pExcThis, ObjectFunction * pThis )
// these are non virtual object methods; there is no this ptr on stack => ecx supplies _this_ ptr // these are non virtual object methods; there is no this ptr on stack => ecx supplies _this_ ptr
//==================================================================================================
static __declspec(naked) void copyConstruct() throw () static __declspec(naked) void copyConstruct() throw ()
{ {
__asm __asm
@ -266,7 +256,7 @@ static __declspec(naked) void copyConstruct() throw ()
ret 4 ret 4
} }
} }
//==================================================================================================
static __declspec(naked) void destruct() throw () static __declspec(naked) void destruct() throw ()
{ {
__asm __asm
@ -279,7 +269,6 @@ static __declspec(naked) void destruct() throw ()
} }
} }
//==================================================================================================
struct ExceptionType struct ExceptionType
{ {
sal_Int32 _n0; sal_Int32 _n0;
@ -300,7 +289,7 @@ struct ExceptionType
inline ~ExceptionType() throw () inline ~ExceptionType() throw ()
{ delete _pCopyCtor; } { delete _pCopyCtor; }
}; };
//==================================================================================================
struct RaiseInfo struct RaiseInfo
{ {
sal_Int32 _n0; sal_Int32 _n0;
@ -359,7 +348,6 @@ RaiseInfo::~RaiseInfo() throw ()
delete _pDtor; delete _pDtor;
} }
//==================================================================================================
class ExceptionInfos class ExceptionInfos
{ {
Mutex _aMutex; Mutex _aMutex;
@ -435,12 +423,9 @@ void * ExceptionInfos::getRaiseInfo( typelib_TypeDescription * pTypeDescr ) thro
} }
//##################################################################################################
//#### exported #################################################################################### //#### exported ####################################################################################
//##################################################################################################
//##################################################################################################
type_info * msci_getRTTI( OUString const & rUNOname ) type_info * msci_getRTTI( OUString const & rUNOname )
{ {
static RTTInfos * s_pRTTIs = 0; static RTTInfos * s_pRTTIs = 0;
@ -460,7 +445,6 @@ type_info * msci_getRTTI( OUString const & rUNOname )
return s_pRTTIs->getRTTI( rUNOname ); return s_pRTTIs->getRTTI( rUNOname );
} }
//##################################################################################################
void msci_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) void msci_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{ {
// no ctor/dtor in here: this leads to dtors called twice upon RaiseException()! // no ctor/dtor in here: this leads to dtors called twice upon RaiseException()!
@ -491,7 +475,6 @@ void msci_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
RaiseException( MSVC_ExceptionCode, EXCEPTION_NONCONTINUABLE, 3, arFilterArgs ); RaiseException( MSVC_ExceptionCode, EXCEPTION_NONCONTINUABLE, 3, arFilterArgs );
} }
//##############################################################################
int msci_filterCppException( int msci_filterCppException(
EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
{ {

3
bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
View File

@ -34,14 +34,11 @@ namespace CPPU_CURRENT_NAMESPACE
const DWORD MSVC_ExceptionCode = 0xe06d7363; const DWORD MSVC_ExceptionCode = 0xe06d7363;
const long MSVC_magic_number = 0x19930520L; const long MSVC_magic_number = 0x19930520L;
//==============================================================================
type_info * msci_getRTTI( OUString const & rUNOname ); type_info * msci_getRTTI( OUString const & rUNOname );
//==============================================================================
int msci_filterCppException( int msci_filterCppException(
EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ); EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno );
//==============================================================================
void msci_raiseException( void msci_raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );

2
bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
View File

@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
//==================================================================================================
inline static void callVirtualMethod( inline static void callVirtualMethod(
void * pAdjustedThisPtr, sal_Int32 nVtableIndex, void * pAdjustedThisPtr, sal_Int32 nVtableIndex,
void * pRegisterReturn, typelib_TypeClass eReturnTypeClass, void * pRegisterReturn, typelib_TypeClass eReturnTypeClass,
@ -136,7 +135,6 @@ Lcleanup:
} }
} }
//==================================================================================================
static void cpp_call( static void cpp_call(
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
bridges::cpp_uno::shared::VtableSlot aVtableSlot, bridges::cpp_uno::shared::VtableSlot aVtableSlot,

1
bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
View File

@ -118,7 +118,6 @@ static inline typelib_TypeClass cpp2uno_call(
// pParamTD will be released at reconversion // pParamTD will be released at reconversion
ppTempParamTD[nTempIndexes++] = pParamTD; ppTempParamTD[nTempIndexes++] = pParamTD;
} }
//
else if ( bridges::cpp_uno::shared::relatesToInterfaceType( pParamTD ) ) else if ( bridges::cpp_uno::shared::relatesToInterfaceType( pParamTD ) )
{ {
::uno_copyAndConvertData( ::uno_copyAndConvertData(

3
bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
View File

@ -37,14 +37,11 @@ const long MSVC_magic_number = 0x19930520L;
typedef enum { REGPARAM_INT, REGPARAM_FLT } RegParamKind; typedef enum { REGPARAM_INT, REGPARAM_FLT } RegParamKind;
//==============================================================================
type_info * mscx_getRTTI( OUString const & rUNOname ); type_info * mscx_getRTTI( OUString const & rUNOname );
//==============================================================================
int mscx_filterCppException( int mscx_filterCppException(
EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ); EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno );
//==============================================================================
void mscx_raiseException( void mscx_raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );

3
bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
View File

@ -21,7 +21,6 @@ package com.sun.star.bridges.jni_uno;
import com.sun.star.lib.util.NativeLibraryLoader; import com.sun.star.lib.util.NativeLibraryLoader;
//==============================================================================
public final class JNI_info_holder public final class JNI_info_holder
{ {
static { static {
@ -49,10 +48,8 @@ public final class JNI_info_holder
private static long s_jni_info_handle; private static long s_jni_info_handle;
//__________________________________________________________________________
private native void finalize( long jni_info_handle ); private native void finalize( long jni_info_handle );
//__________________________________________________________________________
protected void finalize() protected void finalize()
{ {
finalize( s_jni_info_handle ); finalize( s_jni_info_handle );

12
bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
View File

@ -27,7 +27,7 @@ import com.sun.star.uno.IEnvironment;
import com.sun.star.uno.IQueryInterface; import com.sun.star.uno.IQueryInterface;
//==============================================================================
public final class JNI_proxy implements java.lang.reflect.InvocationHandler public final class JNI_proxy implements java.lang.reflect.InvocationHandler
{ {
static { static {
@ -63,7 +63,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
protected String m_oid; protected String m_oid;
protected Class m_class; protected Class m_class;
//__________________________________________________________________________
public static String get_stack_trace( Throwable throwable ) public static String get_stack_trace( Throwable throwable )
throws Throwable throws Throwable
{ {
@ -92,10 +92,8 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
return "\njava stack trace:\n" + trace; return "\njava stack trace:\n" + trace;
} }
//__________________________________________________________________________
private native void finalize( long bridge_handle ); private native void finalize( long bridge_handle );
//__________________________________________________________________________
public void finalize() public void finalize()
{ {
AsynchronousFinalizer.add(new AsynchronousFinalizer.Job() { AsynchronousFinalizer.add(new AsynchronousFinalizer.Job() {
@ -105,7 +103,6 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
}); });
} }
//__________________________________________________________________________
private JNI_proxy( private JNI_proxy(
long bridge_handle, IEnvironment java_env, long bridge_handle, IEnvironment java_env,
long receiver_handle, long td_handle, Type type, String oid ) long receiver_handle, long td_handle, Type type, String oid )
@ -119,7 +116,6 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
m_class = m_type.getZClass(); m_class = m_type.getZClass();
} }
//__________________________________________________________________________
public static Object create( public static Object create(
long bridge_handle, IEnvironment java_env, long bridge_handle, IEnvironment java_env,
long receiver_handle, long td_handle, Type type, String oid, long receiver_handle, long td_handle, Type type, String oid,
@ -132,7 +128,6 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
return java_env.registerInterface( proxy, new String [] { oid }, type ); return java_env.registerInterface( proxy, new String [] { oid }, type );
} }
//__________________________________________________________________________
public static java.lang.reflect.Constructor get_proxy_ctor( Class clazz ) public static java.lang.reflect.Constructor get_proxy_ctor( Class clazz )
throws Throwable throws Throwable
{ {
@ -143,13 +138,12 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
return proxy_class.getConstructor( s_InvocationHandler ); return proxy_class.getConstructor( s_InvocationHandler );
} }
//__________________________________________________________________________
private native Object dispatch_call( private native Object dispatch_call(
long bridge_handle, String method, Object args [] ) long bridge_handle, String method, Object args [] )
throws Throwable; throws Throwable;
// InvocationHandler impl // InvocationHandler impl
//__________________________________________________________________________
public Object invoke( public Object invoke(
Object proxy, java.lang.reflect.Method method, Object args [] ) Object proxy, java.lang.reflect.Method method, Object args [] )
throws Throwable throws Throwable

17
bridges/source/jni_uno/jni_base.h
View File

@ -41,7 +41,6 @@ namespace jni_uno
class JNI_info; class JNI_info;
//==============================================================================
struct BridgeRuntimeError struct BridgeRuntimeError
{ {
OUString m_message; OUString m_message;
@ -52,7 +51,6 @@ struct BridgeRuntimeError
}; };
//==============================================================================
class JNI_context class JNI_context
{ {
JNI_info const * m_jni_info; JNI_info const * m_jni_info;
@ -95,7 +93,6 @@ public:
OUString get_stack_trace( jobject jo_exc = 0 ) const; OUString get_stack_trace( jobject jo_exc = 0 ) const;
}; };
//______________________________________________________________________________
inline void JNI_context::ensure_no_exception() const inline void JNI_context::ensure_no_exception() const
{ {
if (JNI_FALSE != m_env->ExceptionCheck()) if (JNI_FALSE != m_env->ExceptionCheck())
@ -104,7 +101,6 @@ inline void JNI_context::ensure_no_exception() const
} }
} }
//______________________________________________________________________________
inline bool JNI_context::assert_no_exception() const inline bool JNI_context::assert_no_exception() const
{ {
if (JNI_FALSE != m_env->ExceptionCheck()) if (JNI_FALSE != m_env->ExceptionCheck())
@ -120,7 +116,6 @@ inline bool JNI_context::assert_no_exception() const
} }
//==============================================================================
class JNI_guarded_context class JNI_guarded_context
: private ::jvmaccess::VirtualMachine::AttachGuard, : private ::jvmaccess::VirtualMachine::AttachGuard,
public JNI_context public JNI_context
@ -139,7 +134,6 @@ public:
}; };
//==============================================================================
class JLocalAutoRef class JLocalAutoRef
{ {
JNI_context const & m_jni; JNI_context const & m_jni;
@ -167,14 +161,12 @@ public:
inline JLocalAutoRef & operator = ( JLocalAutoRef & auto_ref ); inline JLocalAutoRef & operator = ( JLocalAutoRef & auto_ref );
}; };
//______________________________________________________________________________
inline JLocalAutoRef::~JLocalAutoRef() SAL_THROW(()) inline JLocalAutoRef::~JLocalAutoRef() SAL_THROW(())
{ {
if (0 != m_jo) if (0 != m_jo)
m_jni->DeleteLocalRef( m_jo ); m_jni->DeleteLocalRef( m_jo );
} }
//______________________________________________________________________________
inline JLocalAutoRef::JLocalAutoRef( JLocalAutoRef & auto_ref ) inline JLocalAutoRef::JLocalAutoRef( JLocalAutoRef & auto_ref )
: m_jni( auto_ref.m_jni ), : m_jni( auto_ref.m_jni ),
m_jo( auto_ref.m_jo ) m_jo( auto_ref.m_jo )
@ -182,7 +174,6 @@ inline JLocalAutoRef::JLocalAutoRef( JLocalAutoRef & auto_ref )
auto_ref.m_jo = 0; auto_ref.m_jo = 0;
} }
//______________________________________________________________________________
inline jobject JLocalAutoRef::release() inline jobject JLocalAutoRef::release()
{ {
jobject jo = m_jo; jobject jo = m_jo;
@ -190,7 +181,6 @@ inline jobject JLocalAutoRef::release()
return jo; return jo;
} }
//______________________________________________________________________________
inline void JLocalAutoRef::reset() inline void JLocalAutoRef::reset()
{ {
if (0 != m_jo) if (0 != m_jo)
@ -198,7 +188,6 @@ inline void JLocalAutoRef::reset()
m_jo = 0; m_jo = 0;
} }
//______________________________________________________________________________
inline void JLocalAutoRef::reset( jobject jo ) inline void JLocalAutoRef::reset( jobject jo )
{ {
if (jo != m_jo) if (jo != m_jo)
@ -209,7 +198,6 @@ inline void JLocalAutoRef::reset( jobject jo )
} }
} }
//______________________________________________________________________________
inline JLocalAutoRef & JLocalAutoRef::operator = ( JLocalAutoRef & auto_ref ) inline JLocalAutoRef & JLocalAutoRef::operator = ( JLocalAutoRef & auto_ref )
{ {
assert( m_jni.get_jni_env() == auto_ref.m_jni.get_jni_env() ); assert( m_jni.get_jni_env() == auto_ref.m_jni.get_jni_env() );
@ -219,7 +207,7 @@ inline JLocalAutoRef & JLocalAutoRef::operator = ( JLocalAutoRef & auto_ref )
} }
//==============================================================================
struct rtl_mem struct rtl_mem
{ {
inline static void * operator new ( size_t nSize ) inline static void * operator new ( size_t nSize )
@ -234,7 +222,6 @@ struct rtl_mem
static inline rtl_mem * allocate( ::std::size_t bytes ); static inline rtl_mem * allocate( ::std::size_t bytes );
}; };
//______________________________________________________________________________
inline rtl_mem * rtl_mem::allocate( ::std::size_t bytes ) inline rtl_mem * rtl_mem::allocate( ::std::size_t bytes )
{ {
void * p = rtl_allocateMemory( bytes ); void * p = rtl_allocateMemory( bytes );
@ -244,7 +231,6 @@ inline rtl_mem * rtl_mem::allocate( ::std::size_t bytes )
} }
//==============================================================================
class TypeDescr class TypeDescr
{ {
typelib_TypeDescription * m_td; typelib_TypeDescription * m_td;
@ -261,7 +247,6 @@ public:
{ return m_td; } { return m_td; }
}; };
//______________________________________________________________________________
inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref ) inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref )
: m_td( 0 ) : m_td( 0 )
{ {

2
bridges/source/jni_uno/jni_bridge.h
View File

@ -43,7 +43,6 @@ struct Mapping : public uno_Mapping
Bridge * m_bridge; Bridge * m_bridge;
}; };
//==============================================================================
struct Bridge struct Bridge
{ {
mutable oslInterlockedCount m_ref; mutable oslInterlockedCount m_ref;
@ -57,7 +56,6 @@ struct Bridge
JNI_info const * m_jni_info; JNI_info const * m_jni_info;
//
~Bridge() SAL_THROW(()); ~Bridge() SAL_THROW(());
explicit Bridge( explicit Bridge(
uno_Environment * java_env, uno_ExtEnvironment * uno_env, uno_Environment * java_env, uno_ExtEnvironment * uno_env,

1
bridges/source/jni_uno/jni_data.cxx
View File

@ -1156,7 +1156,6 @@ void Bridge::map_to_uno(
} }
} }
//##############################################################################
void Bridge::map_to_java( void Bridge::map_to_java(

7
bridges/source/jni_uno/jni_helper.h
View File

@ -29,7 +29,6 @@
namespace jni_uno namespace jni_uno
{ {
//------------------------------------------------------------------------------
inline void jstring_to_ustring( inline void jstring_to_ustring(
JNI_context const & jni, rtl_uString ** out_ustr, jstring jstr ) JNI_context const & jni, rtl_uString ** out_ustr, jstring jstr )
{ {
@ -56,7 +55,6 @@ inline void jstring_to_ustring(
} }
} }
//------------------------------------------------------------------------------
inline OUString jstring_to_oustring( inline OUString jstring_to_oustring(
JNI_context const & jni, jstring jstr ) JNI_context const & jni, jstring jstr )
{ {
@ -65,7 +63,6 @@ inline OUString jstring_to_oustring(
return OUString( ustr, SAL_NO_ACQUIRE ); return OUString( ustr, SAL_NO_ACQUIRE );
} }
//------------------------------------------------------------------------------
inline jstring ustring_to_jstring( inline jstring ustring_to_jstring(
JNI_context const & jni, rtl_uString const * ustr ) JNI_context const & jni, rtl_uString const * ustr )
{ {
@ -75,7 +72,6 @@ inline jstring ustring_to_jstring(
} }
//------------------------------------------------------------------------------
// if inException, does not handle exceptions, in which case returned value will // if inException, does not handle exceptions, in which case returned value will
// be null if exception occurred: // be null if exception occurred:
inline jclass find_class( inline jclass find_class(
@ -101,7 +97,6 @@ inline jclass find_class(
} }
//------------------------------------------------------------------------------
inline jobject create_type( JNI_context const & jni, jclass clazz ) inline jobject create_type( JNI_context const & jni, jclass clazz )
{ {
JNI_info const * jni_info = jni.get_info(); JNI_info const * jni_info = jni.get_info();
@ -113,7 +108,6 @@ inline jobject create_type( JNI_context const & jni, jclass clazz )
return jo_type; return jo_type;
} }
//------------------------------------------------------------------------------
inline jobject create_type( inline jobject create_type(
JNI_context const & jni, typelib_TypeDescriptionReference * type ) JNI_context const & jni, typelib_TypeDescriptionReference * type )
{ {
@ -138,7 +132,6 @@ inline jobject create_type(
return jo_type; return jo_type;
} }
//------------------------------------------------------------------------------
inline jobject compute_oid( JNI_context const & jni, jobject jo ) inline jobject compute_oid( JNI_context const & jni, jobject jo )
{ {
JNI_info const * jni_info = jni.get_info(); JNI_info const * jni_info = jni.get_info();

Some files were not shown because too many files have changed in this diff Show More