summaryrefslogtreecommitdiff
path: root/cppu/source/uno
diff options
context:
space:
mode:
Diffstat (limited to 'cppu/source/uno')
-rw-r--r--cppu/source/uno/data.cxx2
-rw-r--r--cppu/source/uno/lbenv.cxx58
-rw-r--r--cppu/source/uno/lbmap.cxx26
-rw-r--r--cppu/source/uno/sequence.cxx8
4 files changed, 47 insertions, 47 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index da358d62a141..f7d8a76fc045 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -46,7 +46,7 @@ namespace cppu
uno_Sequence g_emptySeq = { 1, 0, { 0 } };
typelib_TypeDescriptionReference * g_pVoidType = 0;
-//--------------------------------------------------------------------------------------------------
+
void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * pDestType )
{
// init queryInterface() td
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 5b45be29d411..9f7cc77325bd 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -51,7 +51,7 @@ using ::rtl::OUString;
namespace
{
-//------------------------------------------------------------------------------
+
inline static bool td_equals( typelib_InterfaceTypeDescription * pTD1,
typelib_InterfaceTypeDescription * pTD2 )
{
@@ -66,7 +66,7 @@ inline static bool td_equals( typelib_InterfaceTypeDescription * pTD1,
struct ObjectEntry;
struct uno_DefaultEnvironment;
-//------------------------------------------------------------------------------
+
struct InterfaceEntry
{
sal_Int32 refCount;
@@ -93,7 +93,7 @@ struct ObjectEntry
inline sal_Int32 find( void * iface_ptr, ::std::size_t pos );
};
-//------------------------------------------------------------------------------
+
struct FctPtrHash :
public ::std::unary_function< const void *, ::std::size_t >
{
@@ -101,7 +101,7 @@ struct FctPtrHash :
{ return (::std::size_t) pKey; }
};
-//------------------------------------------------------------------------------
+
struct FctOUStringHash :
public ::std::unary_function< const OUString &, ::std::size_t >
{
@@ -163,7 +163,7 @@ struct uno_DefaultEnvironment : public uno_ExtEnvironment
~uno_DefaultEnvironment();
};
-//______________________________________________________________________________
+
inline ObjectEntry::ObjectEntry( OUString const & rOId_ )
: oid( rOId_ ),
nRef( 0 ),
@@ -172,7 +172,7 @@ inline ObjectEntry::ObjectEntry( OUString const & rOId_ )
aInterfaces.reserve( 2 );
}
-//______________________________________________________________________________
+
inline void ObjectEntry::append(
uno_DefaultEnvironment * pEnv,
void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr,
@@ -198,7 +198,7 @@ inline void ObjectEntry::append(
aInterfaces.push_back( aNewEntry );
}
-//______________________________________________________________________________
+
inline InterfaceEntry * ObjectEntry::find(
typelib_InterfaceTypeDescription * pTypeDescr_ )
{
@@ -230,7 +230,7 @@ inline InterfaceEntry * ObjectEntry::find(
return 0;
}
-//______________________________________________________________________________
+
inline sal_Int32 ObjectEntry::find(
void * iface_ptr, ::std::size_t pos )
{
@@ -246,7 +246,7 @@ inline sal_Int32 ObjectEntry::find(
extern "C"
{
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_registerInterface(
uno_ExtEnvironment * pEnv, void ** ppInterface,
rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
@@ -293,7 +293,7 @@ static void SAL_CALL defenv_registerInterface(
}
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_registerProxyInterface(
uno_ExtEnvironment * pEnv, void ** ppInterface, uno_freeProxyFunc freeProxy,
rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
@@ -351,7 +351,7 @@ static void SAL_CALL defenv_registerProxyInterface(
}
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam)
{
uno_ExtEnvironment * pEnv = va_arg(*pParam, uno_ExtEnvironment *);
@@ -447,7 +447,7 @@ static void SAL_CALL defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pI
uno_Environment_invoke(&pEnv->aBase, s_stub_defenv_revokeInterface, pEnv, pInterface);
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_getObjectIdentifier(
uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
{
@@ -477,7 +477,7 @@ static void SAL_CALL defenv_getObjectIdentifier(
}
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_getRegisteredInterface(
uno_ExtEnvironment * pEnv, void ** ppInterface,
rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
@@ -507,7 +507,7 @@ static void SAL_CALL defenv_getRegisteredInterface(
}
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_getRegisteredInterfaces(
uno_ExtEnvironment * pEnv, void *** pppInterfaces, sal_Int32 * pnLen,
uno_memAlloc memAlloc )
@@ -533,7 +533,7 @@ static void SAL_CALL defenv_getRegisteredInterfaces(
*pnLen = nLen;
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
{
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
@@ -541,7 +541,7 @@ static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
osl_atomic_increment( &that->nRef );
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_release( uno_Environment * pEnv )
{
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
@@ -562,14 +562,14 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv )
}
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_acquireWeak( uno_Environment * pEnv )
{
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
osl_atomic_increment( &that->nWeakRef );
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
{
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
@@ -579,7 +579,7 @@ static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
}
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_harden(
uno_Environment ** ppHardEnv, uno_Environment * pEnv )
{
@@ -607,13 +607,13 @@ static void SAL_CALL defenv_harden(
*ppHardEnv = pEnv;
}
-//------------------------------------------------------------------------------
+
static void SAL_CALL defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * )
{
}
}
-//______________________________________________________________________________
+
uno_DefaultEnvironment::uno_DefaultEnvironment(
const OUString & rEnvDcp_, void * pContext_ )
: nRef( 0 ),
@@ -647,7 +647,7 @@ uno_DefaultEnvironment::uno_DefaultEnvironment(
}
-//______________________________________________________________________________
+
uno_DefaultEnvironment::~uno_DefaultEnvironment()
{
::rtl_uString_release( ((uno_Environment *) this)->pTypeName );
@@ -851,7 +851,7 @@ namespace
class theStaticOIdPart : public rtl::Static<makeOIdPart, theStaticOIdPart> {};
}
-//------------------------------------------------------------------------------
+
inline static const OUString & unoenv_getStaticOIdPart()
{
return theStaticOIdPart::get().getOIdPart();
@@ -860,7 +860,7 @@ inline static const OUString & unoenv_getStaticOIdPart()
extern "C"
{
-//------------------------------------------------------------------------------
+
static void SAL_CALL unoenv_computeObjectIdentifier(
uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
{
@@ -912,7 +912,7 @@ static void SAL_CALL unoenv_releaseInterface(
}
}
-//______________________________________________________________________________
+
EnvironmentsData::~EnvironmentsData()
{
::osl::MutexGuard guard( mutex );
@@ -937,7 +937,7 @@ EnvironmentsData::~EnvironmentsData()
}
}
-//______________________________________________________________________________
+
inline void EnvironmentsData::getEnvironment(
uno_Environment ** ppEnv, const OUString & rEnvDcp, void * pContext )
{
@@ -961,7 +961,7 @@ inline void EnvironmentsData::getEnvironment(
}
}
-//______________________________________________________________________________
+
inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
{
OSL_ENSURE( ppEnv, "### null ptr!" );
@@ -1001,7 +1001,7 @@ inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
}
}
-//______________________________________________________________________________
+
inline void EnvironmentsData::getRegisteredEnvironments(
uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc,
const OUString & rEnvDcp )
@@ -1091,7 +1091,7 @@ static bool loadEnv(OUString const & cLibStem,
extern "C"
{
-//------------------------------------------------------------------------------
+
static uno_Environment * initDefaultEnvironment(
const OUString & rEnvDcp, void * pContext )
{
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index aa8cde9dde7c..ef8a0eec7bea 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -71,27 +71,27 @@ public:
inline bool SAL_CALL is() const SAL_THROW(())
{ return (_pMapping != 0); }
};
-//__________________________________________________________________________________________________
+
inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW(())
: _pMapping( pMapping )
{
if (_pMapping)
(*_pMapping->acquire)( _pMapping );
}
-//__________________________________________________________________________________________________
+
inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW(())
: _pMapping( rMapping._pMapping )
{
if (_pMapping)
(*_pMapping->acquire)( _pMapping );
}
-//__________________________________________________________________________________________________
+
inline Mapping::~Mapping() SAL_THROW(())
{
if (_pMapping)
(*_pMapping->release)( _pMapping );
}
-//__________________________________________________________________________________________________
+
inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(())
{
if (pMapping)
@@ -120,13 +120,13 @@ struct MappingEntry
, aMappingName( rMappingName_ )
{}
};
-//--------------------------------------------------------------------------------------------------
+
struct FctOUStringHash : public std::unary_function< const OUString &, size_t >
{
size_t operator()( const OUString & rKey ) const SAL_THROW(())
{ return (size_t)rKey.hashCode(); }
};
-//--------------------------------------------------------------------------------------------------
+
struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t >
{
size_t operator()( uno_Mapping * pKey ) const SAL_THROW(())
@@ -154,7 +154,7 @@ struct MappingsData
Mutex aNegativeLibsMutex;
t_OUStringSet aNegativeLibs;
};
-//--------------------------------------------------------------------------------------------------
+
static MappingsData & getMappingsData() SAL_THROW(())
{
static MappingsData * s_p = 0;
@@ -195,13 +195,13 @@ struct uno_Mediate_Mapping : public uno_Mapping
};
extern "C"
{
-//--------------------------------------------------------------------------------------------------
+
static void SAL_CALL mediate_free( uno_Mapping * pMapping )
SAL_THROW(())
{
delete static_cast< uno_Mediate_Mapping * >( pMapping );
}
-//--------------------------------------------------------------------------------------------------
+
static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
SAL_THROW(())
{
@@ -215,7 +215,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
static_cast< uno_Mediate_Mapping * >( pMapping )->aAddPurpose.pData );
}
}
-//--------------------------------------------------------------------------------------------------
+
static void SAL_CALL mediate_release( uno_Mapping * pMapping )
SAL_THROW(())
{
@@ -225,7 +225,7 @@ static void SAL_CALL mediate_release( uno_Mapping * pMapping )
uno_revokeMapping( pMapping );
}
}
-//--------------------------------------------------------------------------------------------------
+
static void SAL_CALL mediate_mapInterface(
uno_Mapping * pMapping,
void ** ppOut, void * pInterface,
@@ -261,7 +261,7 @@ static void SAL_CALL mediate_mapInterface(
}
}
}
-//__________________________________________________________________________________________________
+
uno_Mediate_Mapping::uno_Mediate_Mapping(
const Environment & rFrom_, const Environment & rTo_,
const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
@@ -487,7 +487,7 @@ static Mapping getDirectMapping(
return Mapping();
}
-//--------------------------------------------------------------------------------------------------
+
static inline Mapping createMediateMapping(
const Environment & rFrom, const Environment & rTo,
const Mapping & rFrom2Uno, const Mapping & rUno2To,
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 03198c175353..007e5a801d8f 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -40,7 +40,7 @@ using namespace cppu;
namespace cppu
{
-//------------------------------------------------------------------------------
+
static inline uno_Sequence * reallocSeq(
uno_Sequence * pReallocate, sal_Size nElementSize, sal_Int32 nElements )
{
@@ -67,7 +67,7 @@ static inline uno_Sequence * reallocSeq(
return pNew;
}
-//------------------------------------------------------------------------------
+
static inline bool idefaultConstructElements(
uno_Sequence ** ppSeq,
typelib_TypeDescriptionReference * pElementType,
@@ -309,7 +309,7 @@ static inline bool idefaultConstructElements(
}
}
-//------------------------------------------------------------------------------
+
static inline bool icopyConstructFromElements(
uno_Sequence ** ppSeq, void * pSourceElements,
typelib_TypeDescriptionReference * pElementType,
@@ -587,7 +587,7 @@ static inline bool icopyConstructFromElements(
}
}
-//------------------------------------------------------------------------------
+
static inline bool ireallocSequence(
uno_Sequence ** ppSequence,
typelib_TypeDescriptionReference * pElementType,