diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /bridges/source/jni_uno | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bridges/source/jni_uno')
-rw-r--r-- | bridges/source/jni_uno/jni_bridge.cxx | 32 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_data.cxx | 6 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_info.cxx | 26 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_java2uno.cxx | 10 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_uno2java.cxx | 28 |
5 files changed, 51 insertions, 51 deletions
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index 26b030059943..1cc914541e27 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -39,7 +39,7 @@ namespace extern "C" { -//------------------------------------------------------------------------------ + void SAL_CALL Mapping_acquire( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { @@ -47,7 +47,7 @@ void SAL_CALL Mapping_acquire( uno_Mapping * mapping ) that->m_bridge->acquire(); } -//------------------------------------------------------------------------------ + void SAL_CALL Mapping_release( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { @@ -55,7 +55,7 @@ void SAL_CALL Mapping_release( uno_Mapping * mapping ) that->m_bridge->release(); } -//------------------------------------------------------------------------------ + void SAL_CALL Mapping_map_to_uno( uno_Mapping * mapping, void ** ppOut, void * pIn, typelib_InterfaceTypeDescription * td ) @@ -113,7 +113,7 @@ void SAL_CALL Mapping_map_to_uno( } } -//------------------------------------------------------------------------------ + void SAL_CALL Mapping_map_to_java( uno_Mapping * mapping, void ** ppOut, void * pIn, typelib_InterfaceTypeDescription * td ) @@ -174,7 +174,7 @@ void SAL_CALL Mapping_map_to_java( } } -//______________________________________________________________________________ + void SAL_CALL Bridge_free( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { @@ -189,7 +189,7 @@ void SAL_CALL Bridge_free( uno_Mapping * mapping ) namespace jni_uno { -//______________________________________________________________________________ + void Bridge::acquire() const SAL_THROW(()) { if (1 == osl_atomic_increment( &m_ref )) @@ -211,7 +211,7 @@ void Bridge::acquire() const SAL_THROW(()) } } -//______________________________________________________________________________ + void Bridge::release() const SAL_THROW(()) { if (! osl_atomic_decrement( &m_ref )) @@ -223,7 +223,7 @@ void Bridge::release() const SAL_THROW(()) } } -//______________________________________________________________________________ + Bridge::Bridge( uno_Environment * java_env, uno_ExtEnvironment * uno_env, bool registered_java2uno ) @@ -254,7 +254,7 @@ Bridge::Bridge( m_uno2java.m_bridge = this; } -//______________________________________________________________________________ + Bridge::~Bridge() SAL_THROW(()) { (*m_java_env->release)( m_java_env ); @@ -262,7 +262,7 @@ Bridge::~Bridge() SAL_THROW(()) } -//______________________________________________________________________________ + void JNI_context::java_exc_occurred() const { // !don't rely on JNI_info! @@ -329,7 +329,7 @@ void JNI_context::java_exc_occurred() const throw BridgeRuntimeError( message + get_stack_trace( jo_exc.get() ) ); } -//______________________________________________________________________________ + void JNI_context::getClassForName( jclass * classClass, jmethodID * methodForName) const { @@ -342,7 +342,7 @@ void JNI_context::getClassForName( *classClass = c; } -//______________________________________________________________________________ + jclass JNI_context::findClass( char const * name, jclass classClass, jmethodID methodForName, bool inException) const @@ -363,7 +363,7 @@ jclass JNI_context::findClass( return c; } -//______________________________________________________________________________ + OUString JNI_context::get_stack_trace( jobject jo_exc ) const { JLocalAutoRef jo_JNI_proxy( @@ -415,7 +415,7 @@ extern "C" namespace { -//------------------------------------------------------------------------------ + void SAL_CALL java_env_disposing( uno_Environment * java_env ) SAL_THROW_EXTERN_C() { @@ -431,7 +431,7 @@ void SAL_CALL java_env_disposing( uno_Environment * java_env ) #define uno_initEnvironment java_uno_initEnvironment #endif -//------------------------------------------------------------------------------ + SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_env ) SAL_THROW_EXTERN_C() { @@ -449,7 +449,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_e #define uno_ext_getMapping java_uno_ext_getMapping #endif -//------------------------------------------------------------------------------ + SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) SAL_THROW_EXTERN_C() diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx index 06063bd82c1b..8c3a5ec7b616 100644 --- a/bridges/source/jni_uno/jni_data.cxx +++ b/bridges/source/jni_uno/jni_data.cxx @@ -32,7 +32,7 @@ using namespace ::rtl; namespace jni_uno { -//------------------------------------------------------------------------------ + inline rtl_mem * seq_allocate( sal_Int32 nElements, sal_Int32 nSize ) { o3tl::heap_ptr< rtl_mem > seq( @@ -43,7 +43,7 @@ inline rtl_mem * seq_allocate( sal_Int32 nElements, sal_Int32 nSize ) return seq.release(); } -//______________________________________________________________________________ + namespace { void createDefaultUnoValue( @@ -1158,7 +1158,7 @@ void Bridge::map_to_uno( //############################################################################## -//______________________________________________________________________________ + void Bridge::map_to_java( JNI_context const & jni, jvalue * java_data, void const * uno_data, diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx index f55ad4f6802a..ee9818a3afdd 100644 --- a/bridges/source/jni_uno/jni_info.cxx +++ b/bridges/source/jni_uno/jni_info.cxx @@ -40,7 +40,7 @@ using namespace ::rtl; namespace jni_uno { -//______________________________________________________________________________ + JNI_type_info::JNI_type_info( JNI_context const & jni, typelib_TypeDescription * td ) : m_td( td ), @@ -57,7 +57,7 @@ JNI_type_info::JNI_type_info( } -//______________________________________________________________________________ + void JNI_interface_type_info::destroy( JNIEnv * jni_env ) { JNI_type_info::destruct( jni_env ); @@ -67,7 +67,7 @@ void JNI_interface_type_info::destroy( JNIEnv * jni_env ) delete this; } -//______________________________________________________________________________ + JNI_interface_type_info::JNI_interface_type_info( JNI_context const & jni, typelib_TypeDescription * td_ ) : JNI_type_info( jni, td_ ) @@ -222,7 +222,7 @@ JNI_interface_type_info::JNI_interface_type_info( } -//______________________________________________________________________________ + void JNI_compound_type_info::destroy( JNIEnv * jni_env ) { JNI_type_info::destruct( jni_env ); @@ -230,7 +230,7 @@ void JNI_compound_type_info::destroy( JNIEnv * jni_env ) delete this; } -//______________________________________________________________________________ + JNI_compound_type_info::JNI_compound_type_info( JNI_context const & jni, typelib_TypeDescription * td_ ) : JNI_type_info( jni, td_ ), @@ -343,7 +343,7 @@ JNI_compound_type_info::JNI_compound_type_info( } -//______________________________________________________________________________ + JNI_type_info const * JNI_info::create_type_info( JNI_context const & jni, typelib_TypeDescription * td ) const { @@ -389,7 +389,7 @@ JNI_type_info const * JNI_info::create_type_info( return info; } -//______________________________________________________________________________ + JNI_type_info const * JNI_info::get_type_info( JNI_context const & jni, typelib_TypeDescription * td ) const { @@ -416,7 +416,7 @@ JNI_type_info const * JNI_info::get_type_info( return info; } -//______________________________________________________________________________ + JNI_type_info const * JNI_info::get_type_info( JNI_context const & jni, typelib_TypeDescriptionReference * type ) const { @@ -443,7 +443,7 @@ JNI_type_info const * JNI_info::get_type_info( return info; } -//______________________________________________________________________________ + JNI_type_info const * JNI_info::get_type_info( JNI_context const & jni, OUString const & uno_name ) const { @@ -474,7 +474,7 @@ JNI_type_info const * JNI_info::get_type_info( return info; } -//______________________________________________________________________________ + JNI_info::JNI_info( JNIEnv * jni_env, jobject class_loader, jclass classClass, jmethodID methodForName ) @@ -859,7 +859,7 @@ JNI_info::JNI_info( } } -//______________________________________________________________________________ + void JNI_info::destruct( JNIEnv * jni_env ) { t_str2type::const_iterator iPos( m_type_map.begin() ); @@ -901,7 +901,7 @@ void JNI_info::destruct( JNIEnv * jni_env ) jni_env->DeleteGlobalRef( m_class_Any ); } -//______________________________________________________________________________ + JNI_info const * JNI_info::get_jni_info( rtl::Reference< jvmaccess::UnoVirtualMachine > const & uno_vm ) { @@ -966,7 +966,7 @@ JNI_info const * JNI_info::get_jni_info( extern "C" { -//------------------------------------------------------------------------------ + SAL_JNI_EXPORT void JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1info_1holder_finalize__J( JNIEnv * jni_env, SAL_UNUSED_PARAMETER jobject, jlong jni_info_handle ) diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index ffc90ce760a6..fb3068fcb04e 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -31,7 +31,7 @@ using namespace ::rtl; namespace jni_uno { -//______________________________________________________________________________ + jobject Bridge::map_to_java( JNI_context const & jni, uno_Interface * pUnoI, JNI_interface_type_info const * info ) const @@ -82,7 +82,7 @@ jobject Bridge::map_to_java( } -//______________________________________________________________________________ + void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const { if (typelib_TypeClass_EXCEPTION == uno_exc->pType->eTypeClass) @@ -147,7 +147,7 @@ union largest uno_Any a; }; -//______________________________________________________________________________ + jobject Bridge::call_uno( JNI_context const & jni, uno_Interface * pUnoI, typelib_TypeDescription * member_td, @@ -364,7 +364,7 @@ using namespace ::jni_uno; extern "C" { -//------------------------------------------------------------------------------ + SAL_JNI_EXPORT jobject JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( JNIEnv * jni_env, jobject jo_proxy, jlong bridge_handle, jstring jo_method, @@ -613,7 +613,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( } } -//------------------------------------------------------------------------------ + SAL_JNI_EXPORT void JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J( JNIEnv * jni_env, jobject jo_proxy, jlong bridge_handle ) diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index beb4ac0b9e36..6c035643daf8 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -37,19 +37,19 @@ namespace extern "C" { -//------------------------------------------------------------------------------ + void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) SAL_THROW_EXTERN_C(); -//------------------------------------------------------------------------------ + void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C(); -//------------------------------------------------------------------------------ + void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C(); -//------------------------------------------------------------------------------ + void SAL_CALL UNO_proxy_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * member_td, void * uno_ret, void * uno_args[], uno_Any ** uno_exc ) @@ -60,7 +60,7 @@ void SAL_CALL UNO_proxy_dispatch( namespace jni_uno { -//______________________________________________________________________________ + void Bridge::handle_java_exc( JNI_context const & jni, JLocalAutoRef const & jo_exc, uno_Any * uno_exc ) const @@ -119,7 +119,7 @@ void Bridge::handle_java_exc( ->Message)); } -//______________________________________________________________________________ + void Bridge::call_java( jobject javaI, typelib_InterfaceTypeDescription * iface_td, sal_Int32 local_member_index, sal_Int32 function_pos_offset, @@ -419,7 +419,7 @@ struct UNO_proxy : public uno_Interface JNI_interface_type_info const * info ); }; -//______________________________________________________________________________ + inline UNO_proxy::UNO_proxy( JNI_context const & jni, Bridge const * bridge, jobject javaI, jstring jo_oid, OUString const & oid, @@ -452,7 +452,7 @@ inline UNO_proxy::UNO_proxy( uno_Interface::pDispatcher = UNO_proxy_dispatch; } -//______________________________________________________________________________ + inline void UNO_proxy::acquire() const { if (1 == osl_atomic_increment( &m_ref )) @@ -468,7 +468,7 @@ inline void UNO_proxy::acquire() const } } -//______________________________________________________________________________ + inline void UNO_proxy::release() const { if (0 == osl_atomic_decrement( &m_ref )) @@ -480,7 +480,7 @@ inline void UNO_proxy::release() const } -//______________________________________________________________________________ + uno_Interface * Bridge::map_to_uno( JNI_context const & jni, jobject javaI, JNI_interface_type_info const * info ) const @@ -517,7 +517,7 @@ namespace extern "C" { -//------------------------------------------------------------------------------ + void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) SAL_THROW_EXTERN_C() { @@ -555,7 +555,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) delete that; } -//------------------------------------------------------------------------------ + void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C() { @@ -563,7 +563,7 @@ void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI ) that->acquire(); } -//------------------------------------------------------------------------------ + void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C() { @@ -571,7 +571,7 @@ void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI ) that->release(); } -//------------------------------------------------------------------------------ + void SAL_CALL UNO_proxy_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * member_td, void * uno_ret, void * uno_args [], uno_Any ** uno_exc ) |