[Libreoffice-commits] core.git: bridges/inc bridges/source bridges/test
Alexander Wilms
f.alexander.wilms at gmail.com
Sat Mar 1 03:22:05 PST 2014
bridges/inc/bridges/cpp_uno/bridge.hxx | 66 +++++-----
bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx | 6
bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx | 8 -
bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx | 4
bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx | 2
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx | 2
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx | 2
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx | 3
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx | 3
bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx | 1
bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx | 3
bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx | 3
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx | 3
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 3
bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx | 4
bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx | 3
bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx | 4
bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx | 3
bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 3
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_intel/share.hxx | 3
bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx | 4
bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx | 3
bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx | 3
bridges/source/cpp_uno/gcc3_linux_mips/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_mips/share.hxx | 4
bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx | 5
bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx | 3
bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx | 5
bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx | 4
bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx | 4
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 4
bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx | 4
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 3
bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_s390/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_s390/share.hxx | 3
bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx | 1
bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx | 3
bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx | 3
bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx | 4
bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx | 3
bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 10 -
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 4
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 3
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx | 3
bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 4
bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx | 4
bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx | 3
bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx | 4
bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx | 4
bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx | 4
bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 9 -
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 4
bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx | 4
bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx | 4
bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx | 4
bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx | 4
bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx | 4
bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx | 4
bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx | 3
bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx | 2
bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx | 3
bridges/source/cpp_uno/mingw_intel/except.cxx | 4
bridges/source/cpp_uno/mingw_intel/share.hxx | 4
bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx | 8 -
bridges/source/cpp_uno/mingw_x86-64/except.cxx | 4
bridges/source/cpp_uno/mingw_x86-64/share.hxx | 4
bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx | 2
bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx | 4
bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 25 ---
bridges/source/cpp_uno/msvc_win32_intel/msci.hxx | 3
bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx | 2
bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx | 1
bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx | 3
bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java | 3
bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java | 12 -
bridges/source/jni_uno/jni_base.h | 17 --
bridges/source/jni_uno/jni_bridge.h | 2
bridges/source/jni_uno/jni_data.cxx | 1
bridges/source/jni_uno/jni_helper.h | 7 -
bridges/source/jni_uno/jni_info.h | 18 --
bridges/test/java_uno/any/transport.cxx | 3
102 files changed, 87 insertions(+), 388 deletions(-)
New commits:
commit 6660b9d2c57e90ecd77de3eb02bcd2a9f4518684
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 17:44:54 2014 +0100
Remove visual noise from bridges
Change-Id: I53fa23d335ff62795f09f9838d4064cea71aeb65
Reviewed-on: https://gerrit.libreoffice.org/8237
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index e6ffc49..5c72815 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 20d534c..d98d32f 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 a1d834d..39becc7 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 9d57bfa8a..e4bf518 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 f59cd96..eaad465 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 8883523..526ba8b 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 c923804..bfea969 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 8ff236b..4d10b1c 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 5943068..ed2d33f 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 27cc9d8..d8119a3 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 0705789..d65d3d1 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 6c78eb1..daf6daf 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 382233d..bce5cfe 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 4ac41e5..e3bb2a2 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 c9a114a..fc25a0d 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 1848d3f..c79d8d4 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 e294243..1a27011 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 943cbd8..401b226 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 065db3c..99c4e59 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 89b92a6..754117d 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 4861dfd..0e1e658 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 f554a2c..f0f2004 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 e3ece10..4a8723e 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 6c78eb1..daf6daf 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 ecfa126..3f77f71 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 177be52..a47ca67 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 5a3fa81..b76f971 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 f5aeeec..8dadc79 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 4077d57..e247fdb 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 dd7f98c..cd677d0 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 89b92a6..754117d 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 0bc37f6..ecd95ee 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 e8d5085..0dce44c 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 7a4a607..c0b0163 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 4c64443..84b12a3 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 0bc37f6..ecd95ee 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 5984735..8d5c398 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 a04c1e2..ae844a7 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 6c78eb1..e9d6c33 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 0bc37f6..ecd95ee 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 bb30611..1491cec 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 8bb611f..fa1d63b 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 6c78eb1..daf6daf 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 4e7a197..831c68c 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 a1874d8..0923b05 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 0abea46..80c0730 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 6c78eb1..daf6daf 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 0bc37f6..9a83d73 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 7fa5db2..3e25018 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 00b8a34..901492e 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 6c78eb1..daf6daf 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 35a49a5..c2abacb 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 ddd43b2..1a8f228 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 b014fe1..b4fddaa 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 b815b54..d238c94 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 46fc93a..7299b9f 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 def4e8d..24be4a0 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 3d773d0..1756977 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 68df95c..08063a6 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 61702b7..e476119 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 4dae7d2..d460180e 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 52911af..f98963a 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 965c53c..6988dcb 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 fc2adbd..90b6d5c 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 0771234..34cd482 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 c48d1a5..a2020c0 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 6d75ba3..2283ba4 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 0bc37f6..ecd95ee 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 6a4ab3f..10fd194 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 94844fe..67d2f88 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 965c53c..6988dcb 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 c8535d6..e3d5269 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 17f93fe..e35493e 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 930f6d1..9051979 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 69afe91..25d4c2b 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 b16c110..0e47072 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 3d7ef69..2be1c23 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 0579ba1..f42a455 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 f025b28..f0447a1 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 46fc93a..7299b9f 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 a794fa5..6482e46 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 20fc899..7cc8f95 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 d6ec521..3091dc5 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 3ddc011..0e37072 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 1c4ea66..bd6b007 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 *
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list