strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove visual noise from cppu

Browse source 
Change-Id: Ib776a6e5397eb9731cf908c4015642c29b320ff6
Reviewed-on: https://gerrit.libreoffice.org/8247
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Alexander Wilms 2014-02-25 18:01:43 +01:00 committed by Caolán McNamara
parent 0bb7b87a7e
commit f480f26e61
17 changed files with 141 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cppu/source/cppu/cppu_opt.cxx
View file

@ -25,7 +25,7 @@
using namespace ::rtl;
//##################################################################################################
extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg(
typelib_TypeDescriptionReference * pType )
SAL_THROW_EXTERN_C()
@ -39,7 +39,7 @@ extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg(
return ret.pData;
}
//##################################################################################################
extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg(
typelib_TypeDescriptionReference * pType )
SAL_THROW_EXTERN_C()
@ -53,7 +53,7 @@ extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg(
return ret.pData;
}
//##############################################################################
extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg(
uno_Any * pAny, typelib_TypeDescriptionReference * pType )
SAL_THROW_EXTERN_C()

12
cppu/source/threadpool/current.cxx
View file

@ -93,9 +93,9 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
return s_type_XCurrentContext;
}
//##################################################################################################
//==================================================================================================
class ThreadKey
{
bool _bInit;
@ -137,7 +137,7 @@ inline oslThreadKey ThreadKey::getThreadKey() SAL_THROW(())
return _hThreadKey;
}
//==================================================================================================
extern "C" void SAL_CALL delete_IdContainer( void * p )
{
if (p)
@ -158,7 +158,7 @@ extern "C" void SAL_CALL delete_IdContainer( void * p )
delete pId;
}
}
//==================================================================================================
IdContainer * getIdContainer() SAL_THROW(())
{
static ThreadKey s_key( delete_IdContainer );
@ -178,7 +178,7 @@ IdContainer * getIdContainer() SAL_THROW(())
}
//##################################################################################################
extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_setCurrentContext(
void * pCurrentContext,
rtl_uString * pEnvTypeName, void * pEnvContext )
@ -226,7 +226,7 @@ extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_setCurrentContext(
}
return sal_True;
}
//##################################################################################################
extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_getCurrentContext(
void ** ppCurrentContext, rtl_uString * pEnvTypeName, void * pEnvContext )
SAL_THROW_EXTERN_C()

2
cppu/source/threadpool/current.hxx
View file

@ -32,7 +32,7 @@ struct IdContainer
{
void * pCurrentContext;
uno_ExtEnvironment * pCurrentContextEnv;
//
bool bInit;
sal_Sequence * pLocalThreadId;
sal_Int32 nRefCountOfCurrentId;

4
cppu/source/threadpool/thread.hxx
View file

@ -30,10 +30,10 @@ namespace cppu_threadpool {
class JobQueue;
//-----------------------------------------
// private thread class for the threadpool
// independent from vos
//-----------------------------------------
class ORequestThread:
public salhelper::SimpleReferenceObject, public osl::Thread
{

14
cppu/source/typelib/static_types.cxx
View file

@ -132,7 +132,7 @@ static inline typelib_TypeDescriptionReference * igetTypeByName( rtl_uString * p
extern "C"
{
//##################################################################################################
CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
typelib_TypeClass eTypeClass )
SAL_THROW_EXTERN_C()
@ -296,7 +296,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
return &s_aTypes[eTypeClass];
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL typelib_static_type_init(
typelib_TypeDescriptionReference ** ppRef,
typelib_TypeClass eTypeClass, const sal_Char * pTypeName )
@ -316,7 +316,7 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_type_init(
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL typelib_static_sequence_type_init(
typelib_TypeDescriptionReference ** ppRef,
typelib_TypeDescriptionReference * pElementType )
@ -351,7 +351,7 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_sequence_type_init(
}
}
//##################################################################################################
namespace {
void init(
@ -458,7 +458,7 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_struct_type_init(
ppMembers, pParameterizedTypes);
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL typelib_static_interface_type_init(
typelib_TypeDescriptionReference ** ppRef,
const sal_Char * pTypeName,
@ -469,7 +469,7 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_interface_type_init(
ppRef, pTypeName, pBaseType == 0 ? 0 : 1, &pBaseType);
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL typelib_static_mi_interface_type_init(
typelib_TypeDescriptionReference ** ppRef,
const sal_Char * pTypeName,
@ -533,7 +533,7 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_mi_interface_type_init(
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL typelib_static_enum_type_init(
typelib_TypeDescriptionReference ** ppRef,
const sal_Char * pTypeName,

10
cppu/source/typelib/typelib.cxx
View file

@ -2315,7 +2315,7 @@ extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_equ
rtl_ustr_compare( p1->pTypeName->buffer, p2->pTypeName->buffer ) == 0));
}
//##################################################################################################
extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_assign(
typelib_TypeDescriptionReference ** ppDest,
typelib_TypeDescriptionReference * pSource )
@ -2329,7 +2329,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_assign(
}
}
//##################################################################################################
extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize )
SAL_THROW_EXTERN_C()
{
@ -2367,7 +2367,7 @@ static const sal_Bool s_aAssignableFromTab[11][11] =
/* TypeClass_DOUBLE */ { 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1 }
};
//##################################################################################################
extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom(
typelib_TypeDescriptionReference * pAssignable,
typelib_TypeDescriptionReference * pFrom )
@ -2439,7 +2439,7 @@ extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_isA
}
return sal_False;
}
//##################################################################################################
extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom(
typelib_TypeDescription * pAssignable,
typelib_TypeDescription * pFrom )
@ -2449,7 +2449,7 @@ extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_isAssignable
pAssignable->pWeakRef, pFrom->pWeakRef );
}
//##################################################################################################
extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_complete(
typelib_TypeDescription ** ppTypeDescr )
SAL_THROW_EXTERN_C()

16
cppu/source/uno/any.cxx
View file

@ -26,7 +26,7 @@ using namespace cppu;
extern "C"
{
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_type_any_assign(
uno_Any * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
@ -43,7 +43,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_any_assign(
CONSTRUCT_EMPTY_ANY( pDest );
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_any_assign(
uno_Any * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
@ -60,7 +60,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_any_assign(
CONSTRUCT_EMPTY_ANY( pDest );
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_type_any_construct(
uno_Any * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
@ -76,7 +76,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_any_construct(
CONSTRUCT_EMPTY_ANY( pDest );
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_any_construct(
uno_Any * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
@ -92,7 +92,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_any_construct(
CONSTRUCT_EMPTY_ANY( pDest );
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_type_any_constructAndConvert(
uno_Any * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
@ -108,7 +108,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_any_constructAndConvert(
CONSTRUCT_EMPTY_ANY( pDest );
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_any_constructAndConvert(
uno_Any * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
@ -124,13 +124,13 @@ CPPU_DLLPUBLIC void SAL_CALL uno_any_constructAndConvert(
CONSTRUCT_EMPTY_ANY( pDest );
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release )
SAL_THROW_EXTERN_C()
{
_destructAny( pValue, release );
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release )
SAL_THROW_EXTERN_C()
{

14
cppu/source/uno/assign.hxx
View file

@ -30,12 +30,12 @@
namespace cppu
{
//##################################################################################################
//#### assignment ##################################################################################
//##################################################################################################
//--------------------------------------------------------------------------------------------------
inline void _assignInterface(
void ** ppDest, void * pSource,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
@ -46,7 +46,7 @@ inline void _assignInterface(
*ppDest = pSource;
_release( pToBeReleased, release );
}
//--------------------------------------------------------------------------------------------------
inline void * _queryInterface(
void * pSource,
typelib_TypeDescriptionReference * pDestType,
@ -61,13 +61,13 @@ inline void * _queryInterface(
}
return pSource;
}
//==================================================================================================
bool assignStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
SAL_THROW(());
//--------------------------------------------------------------------------------------------------
inline bool _assignStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
@ -100,7 +100,7 @@ inline bool _assignStruct(
}
return true;
}
//--------------------------------------------------------------------------------------------------
inline bool _assignData(
void * pDest,
typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr,

12
cppu/source/uno/constr.hxx
View file

@ -25,16 +25,16 @@
namespace cppu
{
//##################################################################################################
//#### construction ################################################################################
//##################################################################################################
//==================================================================================================
//#### construction ################################################################################
void defaultConstructStruct(
void * pMem,
typelib_CompoundTypeDescription * pCompType )
SAL_THROW(());
//--------------------------------------------------------------------------------------------------
inline void _defaultConstructStruct(
void * pMem,
typelib_CompoundTypeDescription * pTypeDescr )
@ -55,7 +55,7 @@ inline void _defaultConstructStruct(
}
}
//--------------------------------------------------------------------------------------------------
inline void _defaultConstructData(
void * pMem,
typelib_TypeDescriptionReference * pType,

22
cppu/source/uno/copy.hxx
View file

@ -26,11 +26,11 @@
namespace cppu
{
//##################################################################################################
//#### copy construction ###########################################################################
//##################################################################################################
//------------------------------------------------------------------------------
//#### copy construction ###########################################################################
inline uno_Sequence * allocSeq(
sal_Int32 nElementSize, sal_Int32 nElements )
{
@ -50,13 +50,13 @@ inline uno_Sequence * allocSeq(
return pSeq;
}
//--------------------------------------------------------------------------------------------------
void copyConstructStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
SAL_THROW (());
//--------------------------------------------------------------------------------------------------
inline void _copyConstructStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
@ -96,13 +96,13 @@ inline void _copyConstructStruct(
}
}
//------------------------------------------------------------------------------
uno_Sequence * copyConstructSequence(
uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_AcquireFunc acquire, uno_Mapping * mapping );
//--------------------------------------------------------------------------------------------------
inline void _copyConstructAnyFromData(
uno_Any * pDestAny, void * pSource,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
@ -232,7 +232,7 @@ inline void _copyConstructAnyFromData(
break;
}
}
//--------------------------------------------------------------------------------------------------
inline void _copyConstructAny(
uno_Any * pDestAny, void * pSource,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
@ -372,7 +372,7 @@ inline void _copyConstructAny(
}
}
}
//------------------------------------------------------------------------------
inline uno_Sequence * icopyConstructSequence(
uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
@ -516,7 +516,7 @@ inline uno_Sequence * icopyConstructSequence(
}
}
//--------------------------------------------------------------------------------------------------
inline void _copyConstructData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,

48
cppu/source/uno/data.cxx
View file

@ -113,7 +113,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p
return ret;
}
//==================================================================================================
void defaultConstructStruct(
void * pMem,
typelib_CompoundTypeDescription * pCompType )
@ -121,7 +121,7 @@ void defaultConstructStruct(
{
_defaultConstructStruct( pMem, pCompType );
}
//==================================================================================================
void copyConstructStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
@ -130,7 +130,7 @@ void copyConstructStruct(
{
_copyConstructStruct( pDest, pSource, pTypeDescr, acquire, mapping );
}
//==================================================================================================
void destructStruct(
void * pValue,
typelib_CompoundTypeDescription * pTypeDescr,
@ -139,7 +139,7 @@ void destructStruct(
{
_destructStruct( pValue, pTypeDescr, release );
}
//==================================================================================================
bool equalStruct(
void * pDest, void *pSource,
typelib_CompoundTypeDescription * pTypeDescr,
@ -148,7 +148,7 @@ bool equalStruct(
{
return _equalStruct( pDest, pSource, pTypeDescr, queryInterface, release );
}
//==================================================================================================
bool assignStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
@ -158,7 +158,7 @@ bool assignStruct(
return _assignStruct( pDest, pSource, pTypeDescr, queryInterface, acquire, release );
}
//==============================================================================
uno_Sequence * copyConstructSequence(
uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
@ -167,7 +167,7 @@ uno_Sequence * copyConstructSequence(
return icopyConstructSequence( pSource, pElementType, acquire, mapping );
}
//==============================================================================
void destructSequence(
uno_Sequence * pSequence,
typelib_TypeDescriptionReference * pType,
@ -177,7 +177,7 @@ void destructSequence(
idestructSequence( pSequence, pType, pTypeDescr, release );
}
//==================================================================================================
bool equalSequence(
uno_Sequence * pDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
@ -189,21 +189,21 @@ bool equalSequence(
extern "C"
{
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_type_constructData(
void * pMem, typelib_TypeDescriptionReference * pType )
SAL_THROW_EXTERN_C()
{
_defaultConstructData( pMem, pType, 0 );
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_constructData(
void * pMem, typelib_TypeDescription * pTypeDescr )
SAL_THROW_EXTERN_C()
{
_defaultConstructData( pMem, pTypeDescr->pWeakRef, pTypeDescr );
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_type_destructData(
void * pValue, typelib_TypeDescriptionReference * pType,
uno_ReleaseFunc release )
@ -211,7 +211,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_destructData(
{
_destructData( pValue, pType, 0, release );
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_destructData(
void * pValue,
typelib_TypeDescription * pTypeDescr,
@ -220,7 +220,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_destructData(
{
_destructData( pValue, pTypeDescr->pWeakRef, pTypeDescr, release );
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_type_copyData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
@ -229,7 +229,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_copyData(
{
_copyConstructData( pDest, pSource, pType, 0, acquire, 0 );
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_copyData(
void * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
@ -238,7 +238,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_copyData(
{
_copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 );
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_type_copyAndConvertData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
@ -247,7 +247,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_copyAndConvertData(
{
_copyConstructData( pDest, pSource, pType, 0, 0, mapping );
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_copyAndConvertData(
void * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
@ -256,7 +256,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_copyAndConvertData(
{
_copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, 0, mapping );
}
//##################################################################################################
CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_equalData(
void * pVal1, typelib_TypeDescriptionReference * pVal1Type,
void * pVal2, typelib_TypeDescriptionReference * pVal2Type,
@ -268,7 +268,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_equalData(
pVal2, pVal2Type,
queryInterface, release );
}
//##################################################################################################
CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_equalData(
void * pVal1, typelib_TypeDescription * pVal1TD,
void * pVal2, typelib_TypeDescription * pVal2TD,
@ -280,7 +280,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_equalData(
pVal2, pVal2TD->pWeakRef,
queryInterface, release );
}
//##################################################################################################
CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_assignData(
void * pDest, typelib_TypeDescriptionReference * pDestType,
void * pSource, typelib_TypeDescriptionReference * pSourceType,
@ -292,7 +292,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_assignData(
pSource, pSourceType, 0,
queryInterface, acquire, release );
}
//##################################################################################################
CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_assignData(
void * pDest, typelib_TypeDescription * pDestTD,
void * pSource, typelib_TypeDescription * pSourceTD,
@ -304,7 +304,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_assignData(
pSource, pSourceTD->pWeakRef, pSourceTD,
queryInterface, acquire, release );
}
//##################################################################################################
CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_isAssignableFromData(
typelib_TypeDescriptionReference * pAssignable,
void * pFrom, typelib_TypeDescriptionReference * pFromType,
@ -335,9 +335,9 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_isAssignableFromData(
}
//##################################################################################################
//##################################################################################################
//##################################################################################################
#if OSL_DEBUG_LEVEL > 1

20
cppu/source/uno/destr.hxx
View file

@ -25,17 +25,17 @@
namespace cppu
{
//##################################################################################################
//#### destruction #################################################################################
//##################################################################################################
//==================================================================================================
//#### destruction #################################################################################
void destructStruct(
void * pValue,
typelib_CompoundTypeDescription * pTypeDescr,
uno_ReleaseFunc release )
SAL_THROW(());
//--------------------------------------------------------------------------------------------------
inline void _destructStruct(
void * pValue,
typelib_CompoundTypeDescription * pTypeDescr,
@ -58,14 +58,14 @@ inline void _destructStruct(
}
}
//==============================================================================
void destructSequence(
uno_Sequence * pSequence,
typelib_TypeDescriptionReference * pType,
typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release );
//--------------------------------------------------------------------------------------------------
inline void _destructAny(
uno_Any * pAny,
uno_ReleaseFunc release )
@ -137,7 +137,7 @@ inline void _destructAny(
::typelib_typedescriptionreference_release( pType );
}
//--------------------------------------------------------------------------------------------------
inline sal_Int32 idestructElements(
void * pElements, typelib_TypeDescriptionReference * pElementType,
sal_Int32 nStartIndex, sal_Int32 nStopIndex,
@ -259,7 +259,7 @@ inline sal_Int32 idestructElements(
}
}
//------------------------------------------------------------------------------
inline void idestructSequence(
uno_Sequence * pSeq,
typelib_TypeDescriptionReference * pType,
@ -291,7 +291,7 @@ inline void idestructSequence(
}
}
//--------------------------------------------------------------------------------------------------
inline void _destructData(
void * pValue,
typelib_TypeDescriptionReference * pType,

18
cppu/source/uno/eq.hxx
View file

@ -28,11 +28,11 @@
namespace cppu
{
//##################################################################################################
//#### equality ####################################################################################
//##################################################################################################
//--------------------------------------------------------------------------------------------------
//#### equality ####################################################################################
inline bool _equalObject(
void * pI1, void * pI2,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
@ -62,13 +62,13 @@ inline bool _equalObject(
return bRet;
}
//==================================================================================================
bool equalStruct(
void * pDest, void *pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW(());
//--------------------------------------------------------------------------------------------------
inline bool _equalStruct(
void * pDest, void *pSource,
typelib_CompoundTypeDescription * pTypeDescr,
@ -99,13 +99,13 @@ inline bool _equalStruct(
}
return true;
}
//==================================================================================================
bool equalSequence(
uno_Sequence * pDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW(());
//--------------------------------------------------------------------------------------------------
inline bool _equalSequence(
uno_Sequence * pDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
@ -262,7 +262,7 @@ inline bool _equalSequence(
return false;
}
}
//--------------------------------------------------------------------------------------------------
inline bool _equalData(
void * pDest,
typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr,

22
cppu/source/uno/lbenv.cxx
View file

@ -124,7 +124,7 @@ typedef ::boost::unordered_map<
::std::equal_to< OUString > > OId2ObjectMap;
//==============================================================================
struct EnvironmentsData
{
::osl::Mutex mutex;
@ -148,7 +148,7 @@ namespace
struct theEnvironmentsData : public rtl::Static< EnvironmentsData, theEnvironmentsData > {};
}
//==============================================================================
struct uno_DefaultEnvironment : public uno_ExtEnvironment
{
sal_Int32 nRef;
@ -653,7 +653,7 @@ uno_DefaultEnvironment::~uno_DefaultEnvironment()
::rtl_uString_release( ((uno_Environment *) this)->pTypeName );
}
//==============================================================================
static void writeLine(
void * stream, const sal_Char * pLine, const sal_Char * pFilter )
{
@ -697,7 +697,7 @@ static void writeLine(
}
}
//==============================================================================
static void writeLine(
void * stream, const OUString & rLine, const sal_Char * pFilter )
{
@ -706,7 +706,7 @@ static void writeLine(
writeLine( stream, aLine.getStr(), pFilter );
}
//##############################################################################
extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment(
void * stream, uno_Environment * pEnv, const sal_Char * pFilter )
SAL_THROW_EXTERN_C()
@ -791,7 +791,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment(
"#########################################", pFilter );
}
//##############################################################################
extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironmentByName(
void * stream, rtl_uString * pEnvDcp, const sal_Char * pFilter )
SAL_THROW_EXTERN_C()
@ -895,7 +895,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier(
}
}
//==============================================================================
static void SAL_CALL unoenv_acquireInterface(
SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ )
{
@ -903,7 +903,7 @@ static void SAL_CALL unoenv_acquireInterface(
(*pUnoI->acquire)( pUnoI );
}
//==============================================================================
static void SAL_CALL unoenv_releaseInterface(
SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ )
{
@ -1139,7 +1139,7 @@ static uno_Environment * initDefaultEnvironment(
return pEnv;
}
//##############################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_createEnvironment(
uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext )
SAL_THROW_EXTERN_C()
@ -1152,7 +1152,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_createEnvironment(
*ppEnv = initDefaultEnvironment( rEnvDcp, pContext );
}
//##############################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_getEnvironment(
uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext )
SAL_THROW_EXTERN_C()
@ -1175,7 +1175,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_getEnvironment(
}
}
//##############################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_getRegisteredEnvironments(
uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc,
rtl_uString * pEnvDcp )

26
cppu/source/uno/lbmap.cxx
View file

@ -102,7 +102,7 @@ inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(())
return *this;
}
//==================================================================================================
struct MappingEntry
{
sal_Int32 nRef;
@ -141,7 +141,7 @@ typedef boost::unordered_map<
typedef set< uno_getMappingFunc > t_CallbackSet;
typedef set< OUString > t_OUStringSet;
//==================================================================================================
struct MappingsData
{
Mutex aMappingsMutex;
@ -279,7 +279,7 @@ uno_Mediate_Mapping::uno_Mediate_Mapping(
uno_Mapping::mapInterface = mediate_mapInterface;
}
//==================================================================================================
static inline OUString getMappingName(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
SAL_THROW(())
@ -297,7 +297,7 @@ static inline OUString getMappingName(
aKey.append( ']' );
return aKey.makeStringAndClear();
}
//==================================================================================================
static inline OUString getBridgeName(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
SAL_THROW(())
@ -378,7 +378,7 @@ static inline oslModule loadModule( const OUString & rBridgeName )
#endif
//==================================================================================================
static Mapping loadExternalMapping(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
SAL_THROW(())
@ -459,7 +459,7 @@ static Mapping loadExternalMapping(
return Mapping();
}
//==================================================================================================
static Mapping getDirectMapping(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose = OUString() )
SAL_THROW(())
@ -502,7 +502,7 @@ static inline Mapping createMediateMapping(
(*pRet->release)( pRet );
return aRet;
}
//==================================================================================================
static Mapping getMediateMapping(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
SAL_THROW(())
@ -570,7 +570,7 @@ using namespace ::cppu;
extern "C"
{
//##################################################################################################
void SAL_CALL uno_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo,
rtl_uString * pAddPurpose )
@ -640,7 +640,7 @@ void SAL_CALL uno_getMapping(
*ppMapping = aRet.get();
}
}
//##################################################################################################
void SAL_CALL uno_getMappingByName(
uno_Mapping ** ppMapping, rtl_uString * pFrom, rtl_uString * pTo,
rtl_uString * pAddPurpose )
@ -670,7 +670,7 @@ void SAL_CALL uno_getMappingByName(
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_registerMapping(
uno_Mapping ** ppMapping, uno_freeMappingFunc freeMapping,
uno_Environment * pFrom, uno_Environment * pTo, rtl_uString * pAddPurpose )
@ -708,7 +708,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_registerMapping(
}
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_revokeMapping(
uno_Mapping * pMapping )
SAL_THROW_EXTERN_C()
@ -733,7 +733,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_revokeMapping(
}
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_registerMappingCallback(
uno_getMappingFunc pCallback )
SAL_THROW_EXTERN_C()
@ -743,7 +743,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_registerMappingCallback(
MutexGuard aGuard( rData.aCallbacksMutex );
rData.aCallbacks.insert( pCallback );
}
//##################################################################################################
CPPU_DLLPUBLIC void SAL_CALL uno_revokeMappingCallback(
uno_getMappingFunc pCallback )
SAL_THROW_EXTERN_C()

20
cppu/source/uno/prim.hxx
View file

@ -44,7 +44,7 @@ namespace cppu
extern uno_Sequence g_emptySeq;
extern typelib_TypeDescriptionReference * g_pVoidType;
//--------------------------------------------------------------------------------------------------
inline void * _map(
void * p,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
@ -69,7 +69,7 @@ inline void * _map(
}
return pRet;
}
//--------------------------------------------------------------------------------------------------
inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW(())
{
if (p)
@ -84,7 +84,7 @@ inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW(())
}
}
}
//--------------------------------------------------------------------------------------------------
inline void _release( void * p, uno_ReleaseFunc release ) SAL_THROW(())
{
if (p)
@ -100,7 +100,7 @@ inline void _release( void * p, uno_ReleaseFunc release ) SAL_THROW(())
}
}
//------------------------------------------------------------------------------
inline sal_uInt32 calcSeqMemSize(
sal_Int32 nElementSize, sal_Int32 nElements )
{
@ -113,13 +113,13 @@ inline sal_uInt32 calcSeqMemSize(
return (sal_uInt32) nSize;
}
//--------------------------------------------------------------------------------------------------
inline uno_Sequence * createEmptySequence() SAL_THROW(())
{
osl_atomic_increment( &g_emptySeq.nRefCount );
return &g_emptySeq;
}
//--------------------------------------------------------------------------------------------------
inline typelib_TypeDescriptionReference * _getVoidType()
SAL_THROW(())
{
@ -131,7 +131,7 @@ inline typelib_TypeDescriptionReference * _getVoidType()
return g_pVoidType;
}
//--------------------------------------------------------------------------------------------------
#if OSL_DEBUG_LEVEL > 0
#define CONSTRUCT_EMPTY_ANY( pAny ) \
(pAny)->pType = _getVoidType(); \
@ -142,15 +142,15 @@ inline typelib_TypeDescriptionReference * _getVoidType()
(pAny)->pData = (pAny);
#endif
//--------------------------------------------------------------------------------------------------
#define TYPE_ACQUIRE( pType ) \
osl_atomic_increment( &(pType)->nRefCount );
//--------------------------------------------------------------------------------------------------
extern "C" void * binuno_queryInterface(
void * pUnoI, typelib_TypeDescriptionReference * pDestType );
//--------------------------------------------------------------------------------------------------
inline bool _type_equals(
typelib_TypeDescriptionReference * pType1, typelib_TypeDescriptionReference * pType2 )
SAL_THROW(())

16
cppu/source/uno/sequence.cxx
View file

@ -672,7 +672,7 @@ static inline bool ireallocSequence(
extern "C"
{
//##############################################################################
sal_Bool SAL_CALL uno_type_sequence_construct(
uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType,
void * pElements, sal_Int32 len,
@ -717,7 +717,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct(
return ret;
}
//##############################################################################
sal_Bool SAL_CALL uno_sequence_construct(
uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr,
void * pElements, sal_Int32 len,
@ -756,7 +756,7 @@ sal_Bool SAL_CALL uno_sequence_construct(
return ret;
}
//##############################################################################
sal_Bool SAL_CALL uno_type_sequence_realloc(
uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType,
sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release )
@ -778,7 +778,7 @@ sal_Bool SAL_CALL uno_type_sequence_realloc(
return ret;
}
//##############################################################################
sal_Bool SAL_CALL uno_sequence_realloc(
uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr,
sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release )
@ -797,7 +797,7 @@ sal_Bool SAL_CALL uno_sequence_realloc(
return ret;
}
//##############################################################################
sal_Bool SAL_CALL uno_type_sequence_reference2One(
uno_Sequence ** ppSequence,
typelib_TypeDescriptionReference * pType,
@ -844,7 +844,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One(
return ret;
}
//##############################################################################
sal_Bool SAL_CALL uno_sequence_reference2One(
uno_Sequence ** ppSequence,
typelib_TypeDescription * pTypeDescr,
@ -888,7 +888,7 @@ sal_Bool SAL_CALL uno_sequence_reference2One(
return ret;
}
//##############################################################################
void SAL_CALL uno_sequence_assign(
uno_Sequence ** ppDest,
uno_Sequence * pSource,
@ -904,7 +904,7 @@ void SAL_CALL uno_sequence_assign(
}
}
//##############################################################################
void SAL_CALL uno_type_sequence_assign(
uno_Sequence ** ppDest,
uno_Sequence * pSource,