diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 17:44:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-01 05:21:45 -0600 |
| commit | 6660b9d2c57e90ecd77de3eb02bcd2a9f4518684 (patch) | |
| tree | e18d4ab053b21545738ca11e54d1438aec44e8e5 /bridges | |
| parent | 875129a8d4eca6b8ac184c4ae3539ffce8194e39 (diff) | |
Remove visual noise from bridges
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>
Diffstat (limited to 'bridges')
102 files changed, 87 insertions, 388 deletions
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index e6ffc49b3f5c..5c72815e6727 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/bridge.hxx @@ -30,7 +30,7 @@ namespace CPPU_CURRENT_NAMESPACE { -//-------------------------------------------------------------------------------------------------- + inline void SAL_CALL cppu_cppInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy ) SAL_THROW(()) { cppu_cppInterfaceProxy * pThis = @@ -48,7 +48,7 @@ inline void SAL_CALL cppu_cppInterfaceProxy_free( uno_ExtEnvironment * pEnv, voi #endif delete pThis; } -//-------------------------------------------------------------------------------------------------- + inline void SAL_CALL cppu_Mapping_uno2cpp( uno_Mapping * pMapping, void ** ppCppI, void * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW(()) @@ -90,7 +90,7 @@ inline void SAL_CALL cppu_Mapping_uno2cpp( ::rtl_uString_release( pOId ); } } -//__________________________________________________________________________________________________ + inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW(()) { 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 ) ); } } -//__________________________________________________________________________________________________ + inline void cppu_cppInterfaceProxy::releaseProxy() SAL_THROW(()) { 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 ) ); } } -//__________________________________________________________________________________________________ + inline cppu_cppInterfaceProxy::cppu_cppInterfaceProxy( cppu_Bridge * pBridge_, uno_Interface * pUnoI_, 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(()) { cppu_unoInterfaceProxy * pThis = @@ -158,7 +158,7 @@ inline void SAL_CALL cppu_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, voi #endif delete pThis; } -//-------------------------------------------------------------------------------------------------- + inline void SAL_CALL cppu_unoInterfaceProxy_acquire( uno_Interface * pUnoI ) SAL_THROW(()) { 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 } } -//-------------------------------------------------------------------------------------------------- + inline void SAL_CALL cppu_unoInterfaceProxy_release( uno_Interface * pUnoI ) SAL_THROW(()) { 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 ); } } -//-------------------------------------------------------------------------------------------------- + inline void SAL_CALL cppu_Mapping_cpp2uno( uno_Mapping * pMapping, void ** ppUnoI, void * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW(()) @@ -231,7 +231,7 @@ inline void SAL_CALL cppu_Mapping_cpp2uno( ::rtl_uString_release( pOId ); } } -//__________________________________________________________________________________________________ + inline cppu_unoInterfaceProxy::cppu_unoInterfaceProxy( cppu_Bridge * pBridge_, ::com::sun::star::uno::XInterface * pCppI_, 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(()) { static_cast< cppu_Mapping * >( pMapping )->pBridge->acquire(); } -//-------------------------------------------------------------------------------------------------- + inline void SAL_CALL cppu_Mapping_release( uno_Mapping * pMapping ) SAL_THROW(()) { static_cast< cppu_Mapping * >( pMapping )->pBridge->release(); } -//__________________________________________________________________________________________________ + inline cppu_Bridge::cppu_Bridge( uno_ExtEnvironment * pCppEnv_, uno_ExtEnvironment * pUnoEnv_, sal_Bool bExportCpp2Uno_ ) SAL_THROW(()) @@ -294,18 +294,18 @@ inline cppu_Bridge::cppu_Bridge( (*((uno_Environment *)pCppEnv)->acquire)( (uno_Environment *)pCppEnv ); (*((uno_Environment *)pUnoEnv)->acquire)( (uno_Environment *)pUnoEnv ); } -//__________________________________________________________________________________________________ + inline cppu_Bridge::~cppu_Bridge() SAL_THROW(()) { (*((uno_Environment *)pUnoEnv)->release)( (uno_Environment *)pUnoEnv ); (*((uno_Environment *)pCppEnv)->release)( (uno_Environment *)pCppEnv ); } -//__________________________________________________________________________________________________ + inline void SAL_CALL cppu_Bridge_free( uno_Mapping * pMapping ) SAL_THROW(()) { delete static_cast< cppu_Mapping * >( pMapping )->pBridge; } -//__________________________________________________________________________________________________ + inline void cppu_Bridge::acquire() SAL_THROW(()) { if (1 == osl_atomic_increment( &nRef )) @@ -326,7 +326,7 @@ inline void cppu_Bridge::acquire() SAL_THROW(()) } } } -//__________________________________________________________________________________________________ + inline void cppu_Bridge::release() SAL_THROW(()) { if (! osl_atomic_decrement( &nRef )) @@ -335,7 +335,7 @@ inline void cppu_Bridge::release() SAL_THROW(()) } } -//################################################################################################## + inline void SAL_CALL cppu_ext_getMapping( 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 -//-------------------------------------------------------------------------------------------------- + inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(()) { static OUString * s_pStaticOidPart = 0; @@ -405,7 +405,7 @@ inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(()) return *s_pStaticOidPart; } // functions set at environment init -//-------------------------------------------------------------------------------------------------- + inline void SAL_CALL cppu_cppenv_computeObjectIdentifier( 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(()) { reinterpret_cast< ::com::sun::star::uno::XInterface * >( pCppI )->acquire(); } -//-------------------------------------------------------------------------------------------------- + inline void SAL_CALL cppu_cppenv_releaseInterface( uno_ExtEnvironment *, void * pCppI ) SAL_THROW(()) { 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_initEnvironment( uno_Environment * pCppEnv ) SAL_THROW(()) { OSL_ENSURE( pCppEnv->pExtEnv, "### expected extended environment!" ); diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx index 20d534c1529b..d98d32f53002 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== + static typelib_TypeClass cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -303,7 +303,7 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== + static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, @@ -434,7 +434,7 @@ static typelib_TypeClass cpp_mediate( return eRet; } -//================================================================================================== + /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx index a1d834d5c4a1..39becc7d8a72 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx @@ -50,7 +50,7 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== + static OUString toUNOname( char const * p ) SAL_THROW(()) { #ifdef DEBUG @@ -88,7 +88,7 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== + class RTTI { 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 * pCppExc; @@ -253,7 +253,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) { OSL_ENSURE( header, "### no exception header!!!" ); diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx index 9d57bfa8a161..e4bf518d02d3 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx @@ -72,12 +72,10 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx index f59cd968fa78..eaad465cf1f4 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx @@ -162,7 +162,7 @@ static void callVirtualMethod( INSERT_INT32(pSV, pDS) \ INSERT_INT32(((sal_uInt32*)pSV)+1, pDS) \ } -//================================================================================================== + static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx index 8883523b9872..526ba8b4a279 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx @@ -291,7 +291,6 @@ namespace } - //===================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, void ** pCallStack, @@ -428,7 +427,6 @@ namespace } } -//======================================================================= /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx index c92380466d53..bfea96955f4c 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx @@ -299,7 +299,6 @@ namespace } - //===================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, void ** pCallStack, @@ -422,7 +421,6 @@ namespace } } -//======================================================================= /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx index 8ff236bb9893..4d10b1c45105 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== void cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -231,7 +230,6 @@ void cpp2uno_call( } -//================================================================================================== extern "C" void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack, void * pReturnValue ) diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx index 59430685d6d6..ed2d33fa2f80 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx @@ -160,7 +160,6 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference * namespace { -//================================================================ void callVirtualMethod( void * pThis, @@ -327,7 +326,7 @@ void callVirtualMethod( *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); namespace { -//======================================================================= + static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx index 27cc9d893955..d8119a3f91a7 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== // The call instruction within the asm section of callVirtualMethod may throw // exceptions. So that the compiler handles this correctly, it is important // that (a) callVirtualMethod might call dummy_can_throw_anything (although this @@ -148,7 +147,6 @@ void callVirtualMethod( } } -//================================================================================================== static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, @@ -358,7 +356,6 @@ bool isSimpleReturnType(typelib_TypeDescription * pTD, bool recursive) } } -//================================================================================================== namespace bridges { namespace cpp_uno { namespace shared { void unoInterfaceProxyDispatch( diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx index 0705789a2e50..d65d3d1422c4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx @@ -326,7 +326,6 @@ static typelib_TypeClass cpp2uno_call( } -//============================================================================ static typelib_TypeClass cpp_mediate( sal_uInt64 nOffsetAndIndex, void ** gpreg, void ** fpreg, void ** ovrflw, diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx index 6c78eb18be25..daf6daf57a7f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx @@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 * pCppExc; @@ -254,7 +251,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) { OSL_ENSURE( header, "### no exception header!!!" ); diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx index 382233d614aa..bce5cfee635a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx @@ -72,12 +72,9 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx index 4ac41e574309..e3bb2a254175 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx @@ -121,7 +121,7 @@ void MapReturn(long r0, typelib_TypeClass eTypeClass, sal_uInt64* pRegisterRetur namespace { -//================================================================================================== + void callVirtualMethod( void * pThis, sal_Int32 nVtableIndex, void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, @@ -192,7 +192,6 @@ void callVirtualMethod( } -//============================================================================ static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx index c9a114a9972a..fc25a0daca2f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx @@ -284,7 +284,6 @@ namespace } - //===================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, void ** pCallStack, @@ -425,7 +424,6 @@ namespace } } -//======================================================================= /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx index 1848d3f8fbd2..c79d8d4aacc1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx @@ -51,7 +51,6 @@ namespace CPPU_CURRENT_NAMESPACE { } - //=================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -89,7 +88,6 @@ namespace CPPU_CURRENT_NAMESPACE #endif } - //===================================================================== class RTTI { 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 ) { #if OSL_DEBUG_LEVEL > 1 @@ -308,7 +305,6 @@ namespace CPPU_CURRENT_NAMESPACE } #endif - //=================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx index e2942433f358..1a270118e296 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx @@ -72,12 +72,9 @@ namespace CPPU_CURRENT_NAMESPACE }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); - // ----- - //==================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); - //==================================================================== void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 943cbd85e8a5..401b22640f93 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -210,7 +210,6 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference * namespace { -//================================================================ void callVirtualMethod( void * pThis, @@ -377,7 +376,7 @@ void callVirtualMethod( *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); namespace { -//======================================================================= + static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx index 065db3cd7ca4..99c4e5965982 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx @@ -366,7 +366,6 @@ namespace } - //===================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, void ** gpreg, double* fpreg, @@ -531,7 +530,6 @@ namespace } } -//======================================================================= /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx index 89b92a64399a..754117dd94d5 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx @@ -51,7 +51,6 @@ namespace CPPU_CURRENT_NAMESPACE { } - //=================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -89,7 +88,6 @@ namespace CPPU_CURRENT_NAMESPACE #endif } - //===================================================================== class RTTI { 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 ) { #if OSL_DEBUG_LEVEL > 1 @@ -278,7 +275,6 @@ namespace CPPU_CURRENT_NAMESPACE return header->adjustedPtr; } - //=================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx index 4861dfd6ffde..0e1e658ba48d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx @@ -72,12 +72,10 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx index f554a2cfad0e..f0f20047cdd6 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx @@ -168,7 +168,7 @@ namespace hppa namespace { -//======================================================================= + static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index e3ece108f8b0..4a8723ec861f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== + static typelib_TypeClass cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -303,7 +303,6 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== static typelib_TypeClass cpp_mediate( sal_uInt64 nOffsetAndIndex, void ** gpreg, void ** fpreg, long sp, long r8, diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx index 6c78eb18be25..daf6daf57a7f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx @@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 * pCppExc; @@ -254,7 +251,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) { OSL_ENSURE( header, "### no exception header!!!" ); diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx index ecfa126d5252..3f77f71e75e8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx @@ -73,12 +73,10 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx index 177be5224b2e..a47ca67250ba 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx @@ -149,7 +149,7 @@ namespace ia64 namespace { -//================================================================================================== + static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn, sal_uInt64 *pStack, sal_uInt32 nStack, @@ -296,7 +296,6 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, if (bOverFlow) \ *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); -//================================================================================================== static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index 5a3fa81208bf..b76f9715dbd9 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== void cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -213,7 +212,6 @@ void cpp2uno_call( } -//================================================================================================== extern "C" void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack, void * pReturnValue ) @@ -337,7 +335,6 @@ extern "C" void cpp_vtable_call( } } -//================================================================================================== extern "C" void privateSnippetExecutorGeneral(); extern "C" void privateSnippetExecutorVoid(); extern "C" void privateSnippetExecutorHyper(); diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index f5aeeec57462..8dadc79e1954 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -47,7 +47,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -85,7 +84,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 ) { #if OSL_DEBUG_LEVEL > 1 @@ -278,7 +275,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx index 4077d57c9404..e247fdb2e648 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx @@ -108,10 +108,9 @@ extern "C" void __cxa_throw( namespace CPPU_CURRENT_NAMESPACE { -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx index dd7f98c53f61..cd677d0e36e1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx @@ -261,7 +261,6 @@ namespace } - //===================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, long sp, long r8, @@ -399,7 +398,6 @@ namespace } } -//======================================================================= /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx index 89b92a64399a..754117dd94d5 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx @@ -51,7 +51,6 @@ namespace CPPU_CURRENT_NAMESPACE { } - //=================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -89,7 +88,6 @@ namespace CPPU_CURRENT_NAMESPACE #endif } - //===================================================================== class RTTI { 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 ) { #if OSL_DEBUG_LEVEL > 1 @@ -278,7 +275,6 @@ namespace CPPU_CURRENT_NAMESPACE return header->adjustedPtr; } - //=================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx index 0bc37f6ad4bf..ecd95eecad19 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx @@ -72,12 +72,10 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx index e8d5085572d8..0dce44c527a6 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx @@ -70,7 +70,6 @@ void MapReturn(long d0, long d1, typelib_TypeClass eReturnType, long *pRegisterR namespace { -//================================================================ void callVirtualMethod( void * pThis, @@ -150,7 +149,7 @@ void callVirtualMethod( *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); namespace { -//======================================================================= + static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index 7a4a607c0a94..c0b01636b88f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -62,7 +62,6 @@ using namespace ::com::sun::star::uno; namespace { - //================================================================================================== static typelib_TypeClass cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -376,7 +375,6 @@ namespace } - //================================================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, @@ -546,7 +544,6 @@ namespace return eRet; } - //================================================================================================== /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx index 4c64443bb34c..84b12a35e8e8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx @@ -48,7 +48,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if defined BRIDGES_DEBUG @@ -86,7 +85,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 ) { #if defined BRIDGES_DEBUG @@ -269,7 +266,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx index 0bc37f6ad4bf..ecd95eecad19 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx @@ -72,12 +72,10 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx index 5984735ce4b6..8d5c39881ee9 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx @@ -42,7 +42,6 @@ namespace { - //================================================================================================== static void callVirtualMethod( void * pAdjustedThisPtr, sal_Int32 nVtableIndex, @@ -98,7 +97,7 @@ namespace // now we need to parse the entire signature string */ // until we get the END indicator */ - // treat complex return pointer like any other parameter // + // treat complex return pointer like any other parameter #ifdef BRDEBUG fprintf(stderr,"overflow area pointer p=%p\n",p); @@ -232,7 +231,6 @@ namespace } - //================================================================================================== static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, @@ -458,7 +456,6 @@ namespace namespace bridges { namespace cpp_uno { namespace shared { -//================================================================================================== void unoInterfaceProxyDispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, void * pReturn, void * pArgs[], uno_Any ** ppException ) diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx index a04c1e2b9261..ae844a76e6b7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx @@ -349,7 +349,6 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, @@ -485,7 +484,6 @@ static typelib_TypeClass cpp_mediate( return eRet; } -//================================================================================================== /** * is called on incoming vtable calls * (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 // pointer there // li r6, 0 - // // #now load up the pointer to the overflow call stack // addi r7,r1,8 diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx index 6c78eb18be25..e9d6c33f7681 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx @@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 * pCppExc; @@ -254,7 +252,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) { OSL_ENSURE( header, "### no exception header!!!" ); diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx index 0bc37f6ad4bf..ecd95eecad19 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx @@ -72,12 +72,10 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx index bb3061138123..1491cec669cb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx @@ -38,7 +38,6 @@ namespace { -//================================================================================================== static void callVirtualMethod( void * pAdjustedThisPtr, sal_Int32 nVtableIndex, @@ -114,7 +113,7 @@ static void callVirtualMethod( // now we need to parse the entire signature string */ // until we get the END indicator */ - // treat complex return pointer like any other parameter // + // treat complex return pointer like any other parameter #if 0 /* Let's figure out what is really going on here*/ @@ -327,7 +326,6 @@ static void callVirtualMethod( } -//================================================================================================== static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 8bb611f93259..fa1d63b47582 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== + static typelib_TypeClass cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -322,7 +322,7 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== + static typelib_TypeClass cpp_mediate( sal_uInt64 nOffsetAndIndex, void ** gpreg, void ** fpreg, long sp, diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx index 6c78eb18be25..daf6daf57a7f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx @@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 * pCppExc; @@ -254,7 +251,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) { OSL_ENSURE( header, "### no exception header!!!" ); diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx index 4e7a19777797..831c68c3c3ff 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx @@ -72,12 +72,10 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx index a1874d82bf30..0923b0553fcd 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx @@ -72,7 +72,7 @@ void MapReturn(long r3, double dret, typelib_TypeClass eTypeClass, void *pRegist namespace { -//================================================================================================== + static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, sal_uInt64 *pStack, sal_uInt32 nStack, @@ -227,7 +227,6 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, if (bOverFlow) \ *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); -//================================================================================================== static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx index 0abea46c928d..80c07305a3cd 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx @@ -309,7 +309,6 @@ static typelib_TypeClass cpp2uno_call( } -//============================================================================ static typelib_TypeClass cpp_mediate( sal_uInt32 nOffsetAndIndex, void ** gpreg, void ** fpreg, void ** ovrflw, @@ -450,7 +449,6 @@ static typelib_TypeClass cpp_mediate( return eRet; } -//================================================================================================== /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx index 6c78eb18be25..daf6daf57a7f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx @@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 * pCppExc; @@ -254,7 +251,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) { OSL_ENSURE( header, "### no exception header!!!" ); diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx index 0bc37f6ad4bf..9a83d7391188 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx @@ -72,12 +72,9 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx index 7fa5db25bb46..3e250185ba41 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx @@ -166,7 +166,6 @@ invoke_copy_to_stack(sal_Int32 * pStackLongs, char * pPT, sal_Int32* d_ov, sal_I } } -//================================================================================================== static void callVirtualMethod( void * pThis, sal_Int32 nVtableIndex, @@ -272,7 +271,6 @@ static void callVirtualMethod( } -//============================================================================ static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx index 00b8a344a9df..901492e4d7e8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx @@ -311,7 +311,6 @@ static typelib_TypeClass cpp2uno_call( } -//============================================================================ static typelib_TypeClass cpp_mediate( sal_uInt64 nOffsetAndIndex, void ** gpreg, void ** fpreg, void ** ovrflw, diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx index 6c78eb18be25..daf6daf57a7f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx @@ -50,7 +50,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -88,7 +87,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 * pCppExc; @@ -254,7 +251,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) { OSL_ENSURE( header, "### no exception header!!!" ); diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx index 35a49a5a46a1..c2abacb3879c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx @@ -72,12 +72,9 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx index ddd43b25c51a..1a8f2289a0b3 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx @@ -118,7 +118,7 @@ void MapReturn(long r2, double f0, typelib_TypeClass eTypeClass, sal_uInt64* pRe namespace { -//================================================================================================== + void callVirtualMethod( void * pThis, sal_Int32 nVtableIndex, void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, @@ -195,7 +195,6 @@ void callVirtualMethod( } -//============================================================================ static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx index b014fe1726c9..b4fddaa28dbc 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::uno; namespace { -//================================================================================================== + static typelib_TypeClass cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -217,7 +217,6 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, @@ -349,7 +348,6 @@ static typelib_TypeClass cpp_mediate( -//================================================================================================== /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx index b815b54a1607..d238c94e8c86 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx @@ -49,7 +49,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if defined BRIDGES_DEBUG @@ -87,7 +86,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 ) { #if defined BRIDGES_DEBUG @@ -270,7 +267,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx index 46fc93a67790..7299b9f434cf 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx @@ -66,10 +66,9 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index def4e8d90d09..24be4a0a2315 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::uno; namespace { -//================================================================================================== // The call instruction within the asm section of callVirtualMethod may throw // exceptions. So that the compiler handles this correctly, it is important // that (a) callVirtualMethod might call dummy_can_throw_anything (although this @@ -271,7 +270,6 @@ void callVirtualMethod( void * pAdjustedThisPtr, } } -//================================================================================================= static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index 3d773d08144e..175697764892 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -42,7 +42,7 @@ using namespace ::osl; using namespace ::rtl; using namespace ::com::sun::star::uno; -//================================================================================================== + // Perform the UNO call // @@ -252,7 +252,6 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== extern "C" typelib_TypeClass cpp_vtable_call( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, void ** gpreg, void ** fpreg, void ** ovrflw, @@ -386,7 +385,6 @@ extern "C" typelib_TypeClass cpp_vtable_call( return eRet; } -//================================================================================================== extern "C" void privateSnippetExecutor( ... ); const int codeSnippetSize = 24; @@ -430,7 +428,6 @@ unsigned char * codeSnippet( unsigned char * code, return code + codeSnippetSize; } -//================================================================================================== struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; }; bridges::cpp_uno::shared::VtableFactory::Slot * @@ -439,14 +436,12 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) return static_cast< Slot * >(block) + 2; } -//================================================================================================== sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize( sal_Int32 slotCount) { return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize; } -//================================================================================================== bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::initializeBlock( void * block, sal_Int32 slotCount) @@ -457,7 +452,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( return slots + slotCount; } -//================================================================================================== + unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, @@ -507,7 +502,6 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( return code; } -//================================================================================================== void bridges::cpp_uno::shared::VtableFactory::flushCode( SAL_UNUSED_PARAMETER unsigned char const *, SAL_UNUSED_PARAMETER unsigned char const * ) diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index 68df95c5f519..08063a674bef 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -49,7 +49,6 @@ using namespace ::__cxxabiv1; namespace CPPU_CURRENT_NAMESPACE { -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -87,7 +86,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; @@ -224,7 +222,6 @@ namespace struct theRTTI : public rtl::Static<RTTI, theRTTI> {}; } -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { #if OSL_DEBUG_LEVEL > 1 @@ -272,7 +269,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx index 61702b7f7a01..e4761196a647 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx @@ -105,10 +105,9 @@ extern "C" void __cxa_throw( namespace CPPU_CURRENT_NAMESPACE { -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index 4dae7d2586cb..d460180eb5b6 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -82,7 +82,6 @@ using namespace ::com::sun::star::uno; else \ *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); -//================================================================================================== namespace { @@ -309,7 +308,6 @@ static void cpp_call( } } -//================================================================================================== namespace bridges { namespace cpp_uno { namespace shared { diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx index 52911af1243f..f98963a2a87d 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== void cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -219,7 +218,6 @@ void cpp2uno_call( } -//================================================================================================== extern "C" void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack, void * pReturnValue ) @@ -349,7 +347,6 @@ extern "C" void cpp_vtable_call( } } -//================================================================================================== extern "C" void privateSnippetExecutorGeneral(); extern "C" void privateSnippetExecutorVoid(); extern "C" void privateSnippetExecutorHyper(); diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx index 965c53c0c3a8..6988dcb42e64 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx @@ -121,7 +121,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -159,7 +158,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 ) { #if OSL_DEBUG_LEVEL > 1 @@ -347,7 +344,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx index fc2adbd5958e..90b6d5c52b88 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx @@ -73,12 +73,10 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx index 0771234025f3..34cd4828ca97 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== // The call instruction within the asm section of callVirtualMethod may throw // exceptions. So that the compiler handles this correctly, it is important // that (a) callVirtualMethod might call dummy_can_throw_anything (although this @@ -147,7 +146,6 @@ void callVirtualMethod( } } -//================================================================================================== static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, @@ -357,7 +355,6 @@ bool isSimpleReturnType(typelib_TypeDescription * pTD, bool recursive) } } -//================================================================================================== namespace bridges { namespace cpp_uno { namespace shared { void unoInterfaceProxyDispatch( diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx index c48d1a55e205..a2020c05023e 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx @@ -326,7 +326,6 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, @@ -462,7 +461,6 @@ static typelib_TypeClass cpp_mediate( return eRet; } -//================================================================================================== /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx index 6d75ba34a1a0..2283ba40d251 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx @@ -49,7 +49,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -87,7 +86,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 * pCppExc; @@ -253,7 +250,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) { OSL_ENSURE( header, "### no exception header!!!" ); diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx index 0bc37f6ad4bf..ecd95eecad19 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx @@ -72,12 +72,10 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx index 6a4ab3ff5cf6..10fd1942a64b 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx @@ -39,7 +39,6 @@ namespace { -//================================================================================================== static void callVirtualMethod( void * pAdjustedThisPtr, sal_Int32 nVtableIndex, @@ -113,7 +112,7 @@ static void callVirtualMethod( // now we need to parse the entire signature string */ // 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 /* Let's figure out what is really going on here*/ @@ -302,7 +301,6 @@ static void callVirtualMethod( } -//================================================================================================== static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index 94844fedf742..67d2f88a0a94 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -42,7 +42,6 @@ using namespace ::osl; using namespace ::rtl; using namespace ::com::sun::star::uno; -//================================================================================================== // Perform the UNO call // @@ -252,7 +251,6 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== extern "C" typelib_TypeClass cpp_vtable_call( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, void ** gpreg, void ** fpreg, void ** ovrflw, @@ -386,7 +384,6 @@ extern "C" typelib_TypeClass cpp_vtable_call( return eRet; } -//================================================================================================== extern "C" void privateSnippetExecutor(); const int codeSnippetSize = 24; @@ -430,7 +427,6 @@ unsigned char * codeSnippet( unsigned char * code, return code + codeSnippetSize; } -//================================================================================================== struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; }; bridges::cpp_uno::shared::VtableFactory::Slot * @@ -439,14 +435,12 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) return static_cast< Slot * >(block) + 2; } -//================================================================================================== sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize( sal_Int32 slotCount) { return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize; } -//================================================================================================== bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::initializeBlock( void * block, sal_Int32 slotCount) @@ -457,7 +451,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( return slots + slotCount; } -//================================================================================================== + unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, @@ -507,7 +501,6 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( return code; } -//================================================================================================== void bridges::cpp_uno::shared::VtableFactory::flushCode( SAL_UNUSED_PARAMETER unsigned char const *, SAL_UNUSED_PARAMETER unsigned char const * ) diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx index 965c53c0c3a8..6988dcb42e64 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx @@ -121,7 +121,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -159,7 +158,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 ) { #if OSL_DEBUG_LEVEL > 1 @@ -347,7 +344,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx index c8535d68ee1b..e3d52695f977 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx @@ -143,12 +143,10 @@ extern "C" void __cxa_throw ( void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); #endif -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx index 17f93fec177d..e35493e199cc 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx @@ -82,7 +82,6 @@ using namespace ::com::sun::star::uno; else \ *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); -//================================================================================================== namespace { @@ -306,7 +305,6 @@ static void cpp_call( } } -//================================================================================================== namespace bridges { namespace cpp_uno { namespace shared { diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx index 930f6d18e9b0..90519790f7d8 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== static typelib_TypeClass cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -219,7 +218,6 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, @@ -351,7 +349,6 @@ static typelib_TypeClass cpp_mediate( return eRet; } -//================================================================================================== /** * is called on incoming vtable calls * (called by asm snippets) @@ -399,7 +396,6 @@ void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) } -//================================================================================================== int const codeSnippetSize = 20; unsigned char * codeSnippet( diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx index 69afe915d07f..25d4c2bf4c93 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx @@ -51,7 +51,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -89,7 +88,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 ) { #if OSL_DEBUG_LEVEL > 1 @@ -272,7 +269,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx index b16c11089d51..0e47072b52e5 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx @@ -71,12 +71,10 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx index 3d7ef690d6bc..2be1c23fe95e 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== void callVirtualMethod( void * pAdjustedThisPtr, sal_Int32 nVtableIndex, @@ -131,7 +130,6 @@ void callVirtualMethod( } } -//================================================================================================== static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx index 0579ba1c37de..f42a45586eb5 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star::uno; namespace { -//================================================================================================== + static typelib_TypeClass cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -216,7 +216,6 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, @@ -348,7 +347,6 @@ static typelib_TypeClass cpp_mediate( -//================================================================================================== /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx index f025b2816f5a..f0447a16580c 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx @@ -48,7 +48,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if defined BRIDGES_DEBUG @@ -86,7 +85,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 ) { #if defined BRIDGES_DEBUG @@ -269,7 +266,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx index 46fc93a67790..7299b9f434cf 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx @@ -66,10 +66,9 @@ struct __cxa_eh_globals }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index a794fa520962..6482e46264ee 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::uno; namespace { -//================================================================================================== // The call instruction within the asm section of callVirtualMethod may throw // exceptions. So that the compiler handles this correctly, it is important // that (a) callVirtualMethod might call dummy_can_throw_anything (although this @@ -266,7 +265,6 @@ void callVirtualMethod( void * pAdjustedThisPtr, } } -//================================================================================================= static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx index 20fc8994c3a7..7cc8f956b17d 100644 --- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== void cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -221,7 +220,6 @@ void cpp2uno_call( } -//================================================================================================== extern "C" void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack, void * pReturnValue ) @@ -345,7 +343,6 @@ extern "C" void cpp_vtable_call( } } -//================================================================================================== extern "C" void privateSnippetExecutorGeneral(); extern "C" void privateSnippetExecutorVoid(); extern "C" void privateSnippetExecutorHyper(); diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx index d6ec5219f329..3091dc56758d 100644 --- a/bridges/source/cpp_uno/mingw_intel/except.cxx +++ b/bridges/source/cpp_uno/mingw_intel/except.cxx @@ -55,7 +55,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -93,7 +92,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 ) { #if OSL_DEBUG_LEVEL > 1 @@ -263,7 +260,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/mingw_intel/share.hxx b/bridges/source/cpp_uno/mingw_intel/share.hxx index 3ddc011dbbea..0e370723b03c 100644 --- a/bridges/source/cpp_uno/mingw_intel/share.hxx +++ b/bridges/source/cpp_uno/mingw_intel/share.hxx @@ -87,12 +87,10 @@ extern "C" void __cxa_throw ( void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); #endif -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx index 1c4ea6695245..bd6b0079aa4b 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx @@ -42,7 +42,6 @@ using namespace ::osl; using namespace ::rtl; using namespace ::com::sun::star::uno; -//================================================================================================== // Perform the UNO call // @@ -252,7 +251,6 @@ static typelib_TypeClass cpp2uno_call( } -//================================================================================================== extern "C" typelib_TypeClass cpp_vtable_call( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, void ** gpreg, void ** fpreg, void ** ovrflw, @@ -386,7 +384,6 @@ extern "C" typelib_TypeClass cpp_vtable_call( return eRet; } -//================================================================================================== extern "C" void privateSnippetExecutor( ... ); const int codeSnippetSize = 24; @@ -430,7 +427,6 @@ unsigned char * codeSnippet( unsigned char * code, return code + codeSnippetSize; } -//================================================================================================== struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; }; bridges::cpp_uno::shared::VtableFactory::Slot * @@ -439,14 +435,12 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) return static_cast< Slot * >(block) + 2; } -//================================================================================================== sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize( sal_Int32 slotCount) { return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize; } -//================================================================================================== bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::initializeBlock( void * block, sal_Int32 slotCount) @@ -457,7 +451,6 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( return slots + slotCount; } -//================================================================================================== unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( Slot ** slots, unsigned char * code, typelib_InterfaceTypeDescription const * type, @@ -506,7 +499,6 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( return code; } -//================================================================================================== void bridges::cpp_uno::shared::VtableFactory::flushCode( SAL_UNUSED_PARAMETER unsigned char const *, SAL_UNUSED_PARAMETER unsigned char const * ) diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx index d6ec5219f329..3091dc56758d 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx @@ -55,7 +55,6 @@ void dummy_can_throw_anything( char const * ) { } -//================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 @@ -93,7 +92,6 @@ static OUString toUNOname( char const * p ) SAL_THROW(()) #endif } -//================================================================================================== class RTTI { 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 ) { #if OSL_DEBUG_LEVEL > 1 @@ -263,7 +260,6 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) __cxa_throw( pCppExc, rtti, deleteException ); } -//================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { if (! header) diff --git a/bridges/source/cpp_uno/mingw_x86-64/share.hxx b/bridges/source/cpp_uno/mingw_x86-64/share.hxx index 3ddc011dbbea..0e370723b03c 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/share.hxx +++ b/bridges/source/cpp_uno/mingw_x86-64/share.hxx @@ -87,12 +87,10 @@ extern "C" void __cxa_throw ( void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); #endif -// ----- -//================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -//================================================================================================== + void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } diff --git a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx index 6baa18e54cbc..0ff2880e46cc 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx @@ -78,7 +78,6 @@ using namespace ::com::sun::star::uno; else \ *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV ); -//================================================================================================== namespace { @@ -302,7 +301,6 @@ static void cpp_call( } } -//================================================================================================== namespace bridges { namespace cpp_uno { namespace shared { diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index 1b90694028ca..016f7248f290 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== static inline typelib_TypeClass cpp2uno_call( bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const typelib_TypeDescription * pMemberTypeDescr, @@ -228,7 +227,6 @@ static inline typelib_TypeClass cpp2uno_call( } } -//================================================================================================== static typelib_TypeClass __cdecl cpp_mediate( void ** pCallStack, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, sal_Int64 * pRegisterReturn /* space for register return */ ) @@ -348,7 +346,6 @@ static typelib_TypeClass __cdecl cpp_mediate( return eRet; } -//================================================================================================== /** * is called on incoming vtable calls * (called by asm snippets) @@ -395,7 +392,6 @@ Ldouble: } } -//================================================================================================== int const codeSnippetSize = 16; unsigned char * codeSnippet( diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 6a411494010a..04f6d0b7ac7d 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -44,7 +44,6 @@ using namespace ::rtl; namespace CPPU_CURRENT_NAMESPACE { -//================================================================================================== static inline OUString toUNOname( OUString const & rRTTIname ) throw () { OUStringBuffer aRet( 64 ); @@ -62,7 +61,7 @@ static inline OUString toUNOname( OUString const & rRTTIname ) throw () } return aRet.makeStringAndClear(); } -//================================================================================================== + static inline OUString toRTTIname( OUString const & rUNOname ) throw () { OUStringBuffer aRet( 64 ); @@ -80,14 +79,11 @@ static inline OUString toRTTIname( OUString const & rUNOname ) throw () } -//################################################################################################## //#### RTTI simulation ############################################################################# -//################################################################################################## typedef boost::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap; -//================================================================================================== class RTTInfos { Mutex _aMutex; @@ -101,7 +97,6 @@ public: ~RTTInfos(); }; -//================================================================================================== class __type_info { friend type_info * RTTInfos::getRTTI( OUString const & ) throw (); @@ -174,12 +169,9 @@ RTTInfos::~RTTInfos() throw () } -//################################################################################################## //#### Exception raising ########################################################################### -//################################################################################################## -//================================================================================================== struct ObjectFunction { char somecode[12]; @@ -236,14 +228,13 @@ ObjectFunction::~ObjectFunction() throw () ::typelib_typedescription_release( _pTypeDescr ); } -//================================================================================================== static void * __cdecl __copyConstruct( void * pExcThis, void * pSource, ObjectFunction * pThis ) throw () { ::uno_copyData( pExcThis, pSource, pThis->_pTypeDescr, cpp_acquire ); return pExcThis; } -//================================================================================================== + static void * __cdecl __destruct( void * pExcThis, ObjectFunction * pThis ) 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 -//================================================================================================== static __declspec(naked) void copyConstruct() throw () { __asm @@ -266,7 +256,7 @@ static __declspec(naked) void copyConstruct() throw () ret 4 } } -//================================================================================================== + static __declspec(naked) void destruct() throw () { __asm @@ -279,7 +269,6 @@ static __declspec(naked) void destruct() throw () } } -//================================================================================================== struct ExceptionType { sal_Int32 _n0; @@ -300,7 +289,7 @@ struct ExceptionType inline ~ExceptionType() throw () { delete _pCopyCtor; } }; -//================================================================================================== + struct RaiseInfo { sal_Int32 _n0; @@ -359,7 +348,6 @@ RaiseInfo::~RaiseInfo() throw () delete _pDtor; } -//================================================================================================== class ExceptionInfos { Mutex _aMutex; @@ -435,12 +423,9 @@ void * ExceptionInfos::getRaiseInfo( typelib_TypeDescription * pTypeDescr ) thro } -//################################################################################################## //#### exported #################################################################################### -//################################################################################################## -//################################################################################################## type_info * msci_getRTTI( OUString const & rUNOname ) { static RTTInfos * s_pRTTIs = 0; @@ -460,7 +445,6 @@ type_info * msci_getRTTI( OUString const & rUNOname ) return s_pRTTIs->getRTTI( rUNOname ); } -//################################################################################################## void msci_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { // 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 ); } -//############################################################################## int msci_filterCppException( EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) { diff --git a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx index 64fd8e71e6bf..4e122b2c7640 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx @@ -34,14 +34,11 @@ namespace CPPU_CURRENT_NAMESPACE const DWORD MSVC_ExceptionCode = 0xe06d7363; const long MSVC_magic_number = 0x19930520L; -//============================================================================== type_info * msci_getRTTI( OUString const & rUNOname ); -//============================================================================== int msci_filterCppException( EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ); -//============================================================================== void msci_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx index 33bfd5865f64..8050c73b320b 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno; namespace { -//================================================================================================== inline static void callVirtualMethod( void * pAdjustedThisPtr, sal_Int32 nVtableIndex, void * pRegisterReturn, typelib_TypeClass eReturnTypeClass, @@ -136,7 +135,6 @@ Lcleanup: } } -//================================================================================================== static void cpp_call( bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx index 0a9a4d60045c..43cdf94c970c 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx @@ -118,7 +118,6 @@ static inline typelib_TypeClass cpp2uno_call( // pParamTD will be released at reconversion ppTempParamTD[nTempIndexes++] = pParamTD; } - // else if ( bridges::cpp_uno::shared::relatesToInterfaceType( pParamTD ) ) { ::uno_copyAndConvertData( diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx index 715514ffc7ce..84311316274d 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx @@ -37,14 +37,11 @@ const long MSVC_magic_number = 0x19930520L; typedef enum { REGPARAM_INT, REGPARAM_FLT } RegParamKind; -//============================================================================== type_info * mscx_getRTTI( OUString const & rUNOname ); -//============================================================================== int mscx_filterCppException( EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ); -//============================================================================== void mscx_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java index 4285eccd95c2..dd5f3511347c 100644 --- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java +++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java @@ -21,7 +21,6 @@ package com.sun.star.bridges.jni_uno; import com.sun.star.lib.util.NativeLibraryLoader; -//============================================================================== public final class JNI_info_holder { static { @@ -49,10 +48,8 @@ public final class JNI_info_holder private static long s_jni_info_handle; - //__________________________________________________________________________ private native void finalize( long jni_info_handle ); - //__________________________________________________________________________ protected void finalize() { finalize( s_jni_info_handle ); diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java index 31861d62a39c..6dcc106ed194 100644 --- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java +++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java @@ -27,7 +27,7 @@ import com.sun.star.uno.IEnvironment; import com.sun.star.uno.IQueryInterface; -//============================================================================== + public final class JNI_proxy implements java.lang.reflect.InvocationHandler { static { @@ -63,7 +63,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler protected String m_oid; protected Class m_class; - //__________________________________________________________________________ + public static String get_stack_trace( Throwable throwable ) throws Throwable { @@ -92,10 +92,8 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler return "\njava stack trace:\n" + trace; } - //__________________________________________________________________________ private native void finalize( long bridge_handle ); - //__________________________________________________________________________ public void finalize() { AsynchronousFinalizer.add(new AsynchronousFinalizer.Job() { @@ -105,7 +103,6 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler }); } - //__________________________________________________________________________ private JNI_proxy( long bridge_handle, IEnvironment java_env, 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(); } - //__________________________________________________________________________ public static Object create( long bridge_handle, IEnvironment java_env, 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 ); } - //__________________________________________________________________________ public static java.lang.reflect.Constructor get_proxy_ctor( Class clazz ) throws Throwable { @@ -143,13 +138,12 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler return proxy_class.getConstructor( s_InvocationHandler ); } - //__________________________________________________________________________ private native Object dispatch_call( long bridge_handle, String method, Object args [] ) throws Throwable; // InvocationHandler impl - //__________________________________________________________________________ + public Object invoke( Object proxy, java.lang.reflect.Method method, Object args [] ) throws Throwable diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 9c06ab4ddd4a..3f44316d7978 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -41,7 +41,6 @@ namespace jni_uno class JNI_info; -//============================================================================== struct BridgeRuntimeError { OUString m_message; @@ -52,7 +51,6 @@ struct BridgeRuntimeError }; -//============================================================================== class JNI_context { JNI_info const * m_jni_info; @@ -95,7 +93,6 @@ public: OUString get_stack_trace( jobject jo_exc = 0 ) const; }; -//______________________________________________________________________________ inline void JNI_context::ensure_no_exception() const { 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 { if (JNI_FALSE != m_env->ExceptionCheck()) @@ -120,7 +116,6 @@ inline bool JNI_context::assert_no_exception() const } -//============================================================================== class JNI_guarded_context : private ::jvmaccess::VirtualMachine::AttachGuard, public JNI_context @@ -139,7 +134,6 @@ public: }; -//============================================================================== class JLocalAutoRef { JNI_context const & m_jni; @@ -167,14 +161,12 @@ public: inline JLocalAutoRef & operator = ( JLocalAutoRef & auto_ref ); }; -//______________________________________________________________________________ inline JLocalAutoRef::~JLocalAutoRef() SAL_THROW(()) { if (0 != m_jo) m_jni->DeleteLocalRef( m_jo ); } -//______________________________________________________________________________ inline JLocalAutoRef::JLocalAutoRef( JLocalAutoRef & auto_ref ) : m_jni( auto_ref.m_jni ), m_jo( auto_ref.m_jo ) @@ -182,7 +174,6 @@ inline JLocalAutoRef::JLocalAutoRef( JLocalAutoRef & auto_ref ) auto_ref.m_jo = 0; } -//______________________________________________________________________________ inline jobject JLocalAutoRef::release() { jobject jo = m_jo; @@ -190,7 +181,6 @@ inline jobject JLocalAutoRef::release() return jo; } -//______________________________________________________________________________ inline void JLocalAutoRef::reset() { if (0 != m_jo) @@ -198,7 +188,6 @@ inline void JLocalAutoRef::reset() m_jo = 0; } -//______________________________________________________________________________ inline void JLocalAutoRef::reset( jobject jo ) { if (jo != m_jo) @@ -209,7 +198,6 @@ inline void JLocalAutoRef::reset( jobject jo ) } } -//______________________________________________________________________________ inline JLocalAutoRef & JLocalAutoRef::operator = ( JLocalAutoRef & auto_ref ) { 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 { inline static void * operator new ( size_t nSize ) @@ -234,7 +222,6 @@ struct rtl_mem static inline rtl_mem * allocate( ::std::size_t bytes ); }; -//______________________________________________________________________________ inline rtl_mem * rtl_mem::allocate( ::std::size_t bytes ) { void * p = rtl_allocateMemory( bytes ); @@ -244,7 +231,6 @@ inline rtl_mem * rtl_mem::allocate( ::std::size_t bytes ) } -//============================================================================== class TypeDescr { typelib_TypeDescription * m_td; @@ -261,7 +247,6 @@ public: { return m_td; } }; -//______________________________________________________________________________ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref ) : m_td( 0 ) { diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h index 4ab4d9681a9e..049f1e543cd1 100644 --- a/bridges/source/jni_uno/jni_bridge.h +++ b/bridges/source/jni_uno/jni_bridge.h @@ -43,7 +43,6 @@ struct Mapping : public uno_Mapping Bridge * m_bridge; }; -//============================================================================== struct Bridge { mutable oslInterlockedCount m_ref; @@ -57,7 +56,6 @@ struct Bridge JNI_info const * m_jni_info; - // ~Bridge() SAL_THROW(()); explicit Bridge( uno_Environment * java_env, uno_ExtEnvironment * uno_env, diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx index 8c3a5ec7b616..60254849897d 100644 --- a/bridges/source/jni_uno/jni_data.cxx +++ b/bridges/source/jni_uno/jni_data.cxx @@ -1156,7 +1156,6 @@ void Bridge::map_to_uno( } } -//############################################################################## void Bridge::map_to_java( diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h index ab158b4e1b3d..fda0dc13d137 100644 --- a/bridges/source/jni_uno/jni_helper.h +++ b/bridges/source/jni_uno/jni_helper.h @@ -29,7 +29,6 @@ namespace jni_uno { -//------------------------------------------------------------------------------ inline void jstring_to_ustring( JNI_context const & jni, rtl_uString ** out_ustr, jstring jstr ) { @@ -56,7 +55,6 @@ inline void jstring_to_ustring( } } -//------------------------------------------------------------------------------ inline OUString jstring_to_oustring( JNI_context const & jni, jstring jstr ) { @@ -65,7 +63,6 @@ inline OUString jstring_to_oustring( return OUString( ustr, SAL_NO_ACQUIRE ); } -//------------------------------------------------------------------------------ inline jstring ustring_to_jstring( 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 // be null if exception occurred: inline jclass find_class( @@ -101,7 +97,6 @@ inline jclass find_class( } -//------------------------------------------------------------------------------ inline jobject create_type( JNI_context const & jni, jclass clazz ) { 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; } -//------------------------------------------------------------------------------ inline jobject create_type( JNI_context const & jni, typelib_TypeDescriptionReference * type ) { @@ -138,7 +132,6 @@ inline jobject create_type( return jo_type; } -//------------------------------------------------------------------------------ inline jobject compute_oid( JNI_context const & jni, jobject jo ) { JNI_info const * jni_info = jni.get_info(); diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index 63ce45dcfd24..fe7c0a108ccc 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -39,7 +39,6 @@ namespace jvmaccess { class UnoVirtualMachine; } namespace jni_uno { -//------------------------------------------------------------------------------ inline bool type_equals( typelib_TypeDescriptionReference * type1, typelib_TypeDescriptionReference * type2 ) @@ -53,14 +52,12 @@ inline bool type_equals( return ((type1->eTypeClass == type2->eTypeClass) && name1.equals( name2 )); } -//------------------------------------------------------------------------------ inline bool is_XInterface( typelib_TypeDescriptionReference * type ) { return ((typelib_TypeClass_INTERFACE == type->eTypeClass) && OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface"); } -//============================================================================== struct JNI_type_info { ::com::sun::star::uno::TypeDescription m_td; @@ -75,7 +72,6 @@ protected: JNI_context const & jni, typelib_TypeDescription * td ); }; -//============================================================================== struct JNI_interface_type_info : public JNI_type_info { jobject m_proxy_ctor; // proxy ctor @@ -88,7 +84,6 @@ struct JNI_interface_type_info : public JNI_type_info JNI_context const & jni, typelib_TypeDescription * td ); }; -//============================================================================== struct JNI_compound_type_info : public JNI_type_info { JNI_type_info const * m_base; @@ -102,7 +97,6 @@ struct JNI_compound_type_info : public JNI_type_info JNI_context const & jni, typelib_TypeDescription * td ); }; -//============================================================================== struct JNI_type_info_holder { JNI_type_info * m_info; @@ -114,7 +108,6 @@ struct JNI_type_info_holder typedef ::boost::unordered_map< OUString, JNI_type_info_holder, OUStringHash > t_str2type; -//============================================================================== class JNI_info { mutable ::osl::Mutex m_mutex; @@ -125,14 +118,12 @@ public: jclass m_class_Class; jmethodID m_method_Class_forName; - // jobject m_object_java_env; jobject m_object_Any_VOID; jobject m_object_Type_UNSIGNED_SHORT; jobject m_object_Type_UNSIGNED_LONG; jobject m_object_Type_UNSIGNED_HYPER; - // jclass m_class_Object; jclass m_class_Character; jclass m_class_Boolean; @@ -151,7 +142,6 @@ public: jclass m_class_TypeClass; jclass m_class_JNI_proxy; - // jmethodID m_method_Object_toString; jmethodID m_method_Class_getName; jmethodID m_method_Throwable_getMessage; @@ -172,7 +162,6 @@ public: jmethodID m_method_Long_longValue; jmethodID m_method_Short_shortValue; - // jmethodID m_method_IEnvironment_getRegisteredInterface; jmethodID m_method_IEnvironment_registerInterface; jmethodID m_method_UnoRuntime_generateOid; @@ -186,7 +175,6 @@ public: jmethodID m_method_TypeClass_fromInt; jfieldID m_field_Enum_m_value; - // jmethodID m_method_JNI_proxy_get_proxy_ctor; jmethodID m_method_JNI_proxy_create; jfieldID m_field_JNI_proxy_m_receiver_handle; @@ -194,15 +182,12 @@ public: jfieldID m_field_JNI_proxy_m_type; jfieldID m_field_JNI_proxy_m_oid; - // ::com::sun::star::uno::TypeDescription m_XInterface_queryInterface_td; ::com::sun::star::uno::Type const & m_Exception_type; ::com::sun::star::uno::Type const & m_RuntimeException_type; ::com::sun::star::uno::Type const & m_void_type; - // JNI_interface_type_info const * m_XInterface_type_info; - // JNI_type_info const * get_type_info( JNI_context const & jni, typelib_TypeDescription * type ) const; @@ -212,7 +197,6 @@ public: JNI_type_info const * get_type_info( JNI_context const & jni, OUString const & uno_name ) const; - // inline static void append_sig( OStringBuffer * buf, typelib_TypeDescriptionReference * type, bool use_Object_for_type_XInterface = true, bool use_slashes = true ); @@ -233,14 +217,12 @@ private: inline ~JNI_info() {} }; -//______________________________________________________________________________ inline void JNI_info::destroy( JNIEnv * jni_env ) { destruct( jni_env ); delete this; } -//______________________________________________________________________________ inline void JNI_info::append_sig( OStringBuffer * buf, typelib_TypeDescriptionReference * type, bool use_Object_for_type_XInterface, bool use_slashes ) diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx index 06c510082e48..9f0b14306472 100644 --- a/bridges/test/java_uno/any/transport.cxx +++ b/bridges/test/java_uno/any/transport.cxx @@ -36,7 +36,7 @@ using ::test::java_uno::anytest::XTransport; namespace { -//================================================================================================== + class Transport : public ::cppu::WeakImplHelper1< XTransport > { public: @@ -51,7 +51,6 @@ Any Transport::mapAny( Any const & any ) } } -//################################################################################################## extern "C" JNIEXPORT jobject JNICALL Java_test_java_1uno_anytest_TestJni_create_1jni_1transport( JNIEnv * jni_env, jclass, jobject loader ) SAL_THROW_EXTERN_C() |