diff options
Diffstat (limited to 'bridges/source/remote/urp')
26 files changed, 254 insertions, 254 deletions
diff --git a/bridges/source/remote/urp/urp_bridgeimpl.cxx b/bridges/source/remote/urp/urp_bridgeimpl.cxx index 0e25746f0a42..53443a0ecf63 100644 --- a/bridges/source/remote/urp/urp_bridgeimpl.cxx +++ b/bridges/source/remote/urp/urp_bridgeimpl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -199,7 +199,7 @@ void urp_BridgeImpl::applyProtocolChanges( const Properties &props ) { m_properties.bForceSynchronous = props.bForceSynchronous; } - + m_properties.bCurrentContext = props.bCurrentContext; } diff --git a/bridges/source/remote/urp/urp_bridgeimpl.hxx b/bridges/source/remote/urp/urp_bridgeimpl.hxx index 4e6d31d22505..59795fac17cd 100644 --- a/bridges/source/remote/urp/urp_bridgeimpl.hxx +++ b/bridges/source/remote/urp/urp_bridgeimpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace bridges_urp { class PropertyObject; - + struct equalOUString { sal_Int32 operator() ( const ::rtl::OUString &s1, const ::rtl::OUString &s2 ) const @@ -56,8 +56,8 @@ struct equalOUString return s1 == s2; } }; - -struct equalType + +struct equalType { sal_Int32 operator() ( const ::com::sun::star::uno::Type &t1, const ::com::sun::star::uno::Type &t2 ) const @@ -68,13 +68,13 @@ struct equalType class OWriterThread; class OReaderThread; - + struct urp_BridgeImpl : public remote_BridgeImpl { urp_BridgeImpl( sal_Int32 nCacheSize , sal_uInt32 nInitialMarshalerSize ); ~urp_BridgeImpl(); - + void applyProtocolChanges( const Properties & ); void startBlockBridge(); @@ -89,7 +89,7 @@ struct urp_BridgeImpl : ::osl::Mutex m_errorListMutex; Marshal m_blockMarshaler; sal_Int32 m_nMarshaledMessages; - + // Caches for vars, that go from local process to the remote process Cache < ::rtl::OUString , equalOUString > m_oidCacheOut; Cache < ::rtl::ByteSequence , EqualThreadId > m_tidCacheOut; @@ -107,9 +107,9 @@ struct urp_BridgeImpl : ::com::sun::star::uno::Type m_lastInType; ::rtl::ByteSequence m_lastInTid; ::rtl::OUString m_lastInOid; - + urp_ClientJobContainer m_clientJobContainer; - + OWriterThread *m_pWriter; OReaderThread *m_pReader; ::rtl::OString m_sLogFileName; diff --git a/bridges/source/remote/urp/urp_cache.h b/bridges/source/remote/urp/urp_cache.h index a0150c854594..ca3dec9c8298 100644 --- a/bridges/source/remote/urp/urp_cache.h +++ b/bridges/source/remote/urp/urp_cache.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/bridges/source/remote/urp/urp_cache.hxx b/bridges/source/remote/urp/urp_cache.hxx index 5aec834199be..e8677116cb96 100644 --- a/bridges/source/remote/urp/urp_cache.hxx +++ b/bridges/source/remote/urp/urp_cache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace bridges_urp m_pCache( new t[nMaxEntries] ), m_nMaxEntries( nMaxEntries ), m_nEntries( 0 ) - { - + { + } template < class t , class tequals > @@ -81,7 +81,7 @@ namespace bridges_urp } return nEntry; } - + template < class t , class tequals > inline sal_uInt16 Cache< t , tequals >::seek( const t & value ) { @@ -110,7 +110,7 @@ namespace bridges_urp sal_Int32 operator () ( const t &value ) const { return value >= m_; } }; - + template < class t, class tequals > inline void Cache < t , tequals >::resize( sal_uInt16 nNewMaxEntries ) { diff --git a/bridges/source/remote/urp/urp_dispatch.cxx b/bridges/source/remote/urp/urp_dispatch.cxx index 459900b2460a..c8c405403938 100644 --- a/bridges/source/remote/urp/urp_dispatch.cxx +++ b/bridges/source/remote/urp/urp_dispatch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/bridges/source/remote/urp/urp_dispatch.hxx b/bridges/source/remote/urp/urp_dispatch.hxx index 2b44854e3350..146732d339b2 100644 --- a/bridges/source/remote/urp/urp_dispatch.hxx +++ b/bridges/source/remote/urp/urp_dispatch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ namespace bridges_urp { const sal_uInt8 HDRFLAG_EXCEPTION = 0x20; void SAL_CALL urp_sendCloseConnection( uno_Environment *pEnvRemote ); - + extern "C" void SAL_CALL urp_sendRequest( uno_Environment *pEnvRemote, typelib_TypeDescription const * pMemberType, diff --git a/bridges/source/remote/urp/urp_environment.cxx b/bridges/source/remote/urp/urp_environment.cxx index f1a61896202b..9f13e60c35e4 100644 --- a/bridges/source/remote/urp/urp_environment.cxx +++ b/bridges/source/remote/urp/urp_environment.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,18 +73,18 @@ rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; // static void dumpProperties( struct Properties *p ) // { -// fprintf( stderr , "FlushBlockSize : %d\n" , p->nFlushBlockSize ); -// fprintf( stderr , "OnewayTimeoutMUSEC : %d\n" , p->nOnewayTimeoutMUSEC ); -// fprintf( stderr , "OidCacheSize : %d\n" , p->nOidCacheSize ); -// fprintf( stderr , "TypeCacheSize : %d\n" , p->nTypeCacheSize ); -// fprintf( stderr , "TidCacheSize : %d\n" , p->nTidCacheSize ); -// OString o = OUStringToOString( p->sSupportedVersions , RTL_TEXTENCODING_ASCII_US ); -// fprintf( stderr , "SupportedVersions : %s\n" , o.pData->buffer ); -// o = OUStringToOString( p->sVersion , RTL_TEXTENCODING_ASCII_US ); -// fprintf( stderr , "Version : %s\n" , o.pData->buffer ); -// fprintf( stderr , "SupportsMultipleSynchronous : %d\n" , p->bSupportsMultipleSynchronous ); -// fprintf( stderr , "SupportsMustReply : %d\n" , p->bSupportsMustReply ); -// fprintf( stderr , "SupportsSynchronous : %d\n" , p->bSupportsSynchronous ); +// fprintf( stderr , "FlushBlockSize : %d\n" , p->nFlushBlockSize ); +// fprintf( stderr , "OnewayTimeoutMUSEC : %d\n" , p->nOnewayTimeoutMUSEC ); +// fprintf( stderr , "OidCacheSize : %d\n" , p->nOidCacheSize ); +// fprintf( stderr , "TypeCacheSize : %d\n" , p->nTypeCacheSize ); +// fprintf( stderr , "TidCacheSize : %d\n" , p->nTidCacheSize ); +// OString o = OUStringToOString( p->sSupportedVersions , RTL_TEXTENCODING_ASCII_US ); +// fprintf( stderr , "SupportedVersions : %s\n" , o.pData->buffer ); +// o = OUStringToOString( p->sVersion , RTL_TEXTENCODING_ASCII_US ); +// fprintf( stderr , "Version : %s\n" , o.pData->buffer ); +// fprintf( stderr , "SupportsMultipleSynchronous : %d\n" , p->bSupportsMultipleSynchronous ); +// fprintf( stderr , "SupportsMustReply : %d\n" , p->bSupportsMustReply ); +// fprintf( stderr , "SupportsSynchronous : %d\n" , p->bSupportsSynchronous ); // } // PropertySetterThread diff --git a/bridges/source/remote/urp/urp_job.cxx b/bridges/source/remote/urp/urp_job.cxx index 8af686fa3ef3..62d43863276d 100644 --- a/bridges/source/remote/urp/urp_job.cxx +++ b/bridges/source/remote/urp/urp_job.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ namespace bridges_urp } return bReturn; } - + //-------------------------------------------------------------------------------------- static void prepareRuntimeExceptionClientSide( uno_Any **ppException , const OUString &s) { @@ -114,7 +114,7 @@ namespace bridges_urp uno_type_any_construct( *ppException , &exception , type.getTypeLibType() , 0 ); } - + Job::Job( uno_Environment *pEnvRemote, remote_Context *pContext, sal_Sequence *pTid, @@ -146,19 +146,19 @@ namespace bridges_urp - + //-------------------------------------------------------------------------------------- sal_Bool ClientJob::extract( ) { sal_Bool bReturn = sal_True; //------------------------------- - // Handle the reply, unpack data + // Handle the reply, unpack data //------------------------------- if( m_bExceptionOccured ) { bReturn = m_pUnmarshal->unpackAny( *m_ppException ); } - else + else { //--------------------------------- // alles ist gut @@ -215,7 +215,7 @@ namespace bridges_urp uno_threadpool_putJob( m_pBridgeImpl->m_hThreadPool, m_pTid , this, 0, sal_False); } - //-------------------------------------------------------------------------------------------- + //-------------------------------------------------------------------------------------------- sal_Bool ClientJob::pack() { sal_Bool bSuccess = sal_True; @@ -295,7 +295,7 @@ namespace bridges_urp // the flag byte is needed + request nFlags = nFlags | HDRFLAG_LONGHEADER | HDRFLAG_REQUEST; // - // as long as we do not have customized calls, no MOREFLAGS must be set + // as long as we do not have customized calls, no MOREFLAGS must be set if( m_nMethodIndex >= 0x100 ) { nFlags = nFlags | HDRFLAG_LONGMETHODID; @@ -347,7 +347,7 @@ namespace bridges_urp if( bOid ) { m_pBridgeImpl->m_lastOutOid = *(OUString *)&m_pOid; - m_pBridgeImpl->m_blockMarshaler.packOid( m_pBridgeImpl->m_lastOutOid ); + m_pBridgeImpl->m_blockMarshaler.packOid( m_pBridgeImpl->m_lastOutOid ); } if( bTid ) { @@ -359,7 +359,7 @@ namespace bridges_urp && m_nMethodIndex != REMOTE_RELEASE_METHOD_INDEX && m_pContext != 0 ) { - void * pCc = 0; + void * pCc = 0; rtl::OUString aEnvName( RTL_CONSTASCII_USTRINGPARAM( "urp" ) ); bSuccess = bSuccess && uno_getCurrentContext( &pCc, aEnvName.pData, m_pContext ); @@ -375,7 +375,7 @@ namespace bridges_urp p->release( p ); } } - + // marshal arguments ! #ifdef BRIDGES_URP_PROT sal_Int32 nLogHeader = m_pBridgeImpl->m_blockMarshaler.getPos(); @@ -439,7 +439,7 @@ namespace bridges_urp m_pMethodType ? m_pMethodType->aBase.pMemberName : m_pAttributeType->aBase.pMemberName ); #endif - + if( bSuccess ) { if( ! m_bOneway ) @@ -453,7 +453,7 @@ namespace bridges_urp // Inform the writer thread, that there is some work to do //--------------------------- m_pBridgeImpl->m_pWriter->touch( ! m_bOneway ); - + if( m_bOneway ) { *m_ppException = 0; @@ -489,9 +489,9 @@ namespace bridges_urp // Wait for the reply //--------------------------- void * pDisposeReason = 0; - + uno_threadpool_enter(m_pBridgeImpl->m_hThreadPool, &pDisposeReason ); - + if( ! pDisposeReason ) { // thread has been disposed ! @@ -501,14 +501,14 @@ namespace bridges_urp // it won't be in the container anymore, but it is eiterway safe to call // the method ClientJob *pJob = - m_pBridgeImpl->m_clientJobContainer.remove( *(ByteSequence*) &m_pTid ); + m_pBridgeImpl->m_clientJobContainer.remove( *(ByteSequence*) &m_pTid ); if( pJob != this ) { // this is not our job, it is probably one of the callstack below, so // push it back m_pBridgeImpl->m_clientJobContainer.add( *(ByteSequence*) &m_pTid , pJob ); } - + OUStringBuffer sMessage( 256 ); sMessage.appendAscii( RTL_CONSTASCII_STRINGPARAM( "URP_Bridge : disposed\n" ) ); sMessage.append( m_pBridgeImpl->getErrorsAsString() ); @@ -543,7 +543,7 @@ namespace bridges_urp , m_nCurrentMemPosition( 0 ) { m_pEnvRemote->acquire( m_pEnvRemote ); - m_nCurrentMemSize = MULTIJOB_STANDARD_MEMORY_SIZE + m_nMaxMessages * ( + m_nCurrentMemSize = MULTIJOB_STANDARD_MEMORY_SIZE + m_nMaxMessages * ( MULTIJOB_PER_CALL_MEMORY_SIZE + sizeof(ServerJobEntry) + sizeof(MemberTypeInfo) ); m_pCurrentMem = ( sal_Int8 * ) rtl_allocateMemory( m_nCurrentMemSize ); m_aEntries = ( ServerJobEntry * ) getHeap( m_nMaxMessages * sizeof( ServerJobEntry ) ); @@ -557,7 +557,7 @@ namespace bridges_urp { struct MemberTypeInfo *const pMTI = &( m_aTypeInfo[i] ); struct ServerJobEntry *const pSJE = &( m_aEntries[i] ); - + if( pSJE->m_pRemoteI ) pSJE->m_pRemoteI->release( pSJE->m_pRemoteI ); @@ -566,10 +566,10 @@ namespace bridges_urp if( pSJE->m_pInterfaceTypeRef ) typelib_typedescriptionreference_release( pSJE->m_pInterfaceTypeRef ); - + if( pMTI->m_pInterfaceType ) TYPELIB_DANGER_RELEASE( (typelib_TypeDescription *)pMTI->m_pInterfaceType ); - + for( sal_Int32 iArgs = 0 ; iArgs < pMTI->m_nArgCount ; iArgs ++ ) { if( pMTI->m_ppArgType[iArgs] ) @@ -635,10 +635,10 @@ namespace bridges_urp // is not a release call. remote_Context *pRemoteC = ((remote_Context*)m_pEnvRemote->pContext); - if( ! pMTI->m_bIsReleaseCall && pRemoteC->m_pInstanceProvider ) + if( ! pMTI->m_bIsReleaseCall && pRemoteC->m_pInstanceProvider ) { pSJE->m_pException = &(pSJE->m_exception); - + pRemoteC->m_pInstanceProvider->getInstance( pRemoteC->m_pInstanceProvider, m_pEnvRemote, @@ -667,7 +667,7 @@ namespace bridges_urp else { pSJE->m_pException = &(pSJE->m_exception ); - + if( pMTI->m_bIsReleaseCall ) { pSJE->m_pRemoteI->release( pSJE->m_pRemoteI ); @@ -708,18 +708,18 @@ namespace bridges_urp uno_destructData( pSJE->m_ppArgs[j] , pMTI->m_ppArgType[j] , 0 ); } } - + if( pSJE->m_pException ) { uno_any_destruct( pSJE->m_pException, ::bridges_remote::remote_release ); } - + } else { // synchron, get the mutex to marshal reply and send immeadiatly MutexGuard guard( m_pBridgeImpl->m_marshalingMutex ); - + sal_Bool bTid = sal_False; sal_uInt8 nFlags = HDRFLAG_LONGHEADER; ByteSequence tid = m_pTid; @@ -729,7 +729,7 @@ namespace bridges_urp nFlags = nFlags | HDRFLAG_NEWTID; bTid = sal_True; } - + if( pSJE->m_pException ) { nFlags = nFlags | HDRFLAG_EXCEPTION; @@ -738,7 +738,7 @@ namespace bridges_urp sal_Int32 nLogStart = m_pBridgeImpl->m_blockMarshaler.getPos(); #endif m_pBridgeImpl->m_blockMarshaler.packInt8( &nFlags ); - + if( bTid ) { if( ! pSJE->m_bIgnoreCache ) @@ -759,7 +759,7 @@ namespace bridges_urp //-------------------- m_pBridgeImpl->m_blockMarshaler.packAny( &(pSJE->m_exception) ); uno_any_destruct( &(pSJE->m_exception) , ::bridges_remote::remote_release ); - + // destroy in parameters for( sal_Int32 j = 0 ; j < pMTI->m_nArgCount ; j ++ ) { @@ -799,21 +799,21 @@ namespace bridges_urp } } } - + #ifdef BRIDGES_URP_PROT { typelib_InterfaceMemberTypeDescription *pMemberType = pMTI->m_pMethodType ? (typelib_InterfaceMemberTypeDescription*)pMTI->m_pMethodType : (typelib_InterfaceMemberTypeDescription*)pMTI->m_pAttributeType; - + urp_logReplying( m_pBridgeImpl , m_pBridgeImpl->m_blockMarshaler.getPos() - nLogStart, m_pBridgeImpl->m_blockMarshaler.getPos() - nLogHeader, pMemberType->pMemberName ); - } + } #endif - + m_pBridgeImpl->m_nMarshaledMessages ++; // put it on the wire m_pBridgeImpl->m_pWriter->touch( sal_True ); @@ -832,7 +832,7 @@ namespace bridges_urp } } } - + //------------------------------------------------------------------------------------- void ServerMultiJob::prepareRuntimeException( const OUString & sMessage , sal_Int32 nCall ) { @@ -876,7 +876,7 @@ namespace bridges_urp pSJE->m_ppArgs = 0; pSJE->m_pReturn = 0; pMTI->m_pReturnType = 0; - + if( pMTI->m_nArgCount ) { pMTI->m_ppArgType = @@ -888,11 +888,11 @@ namespace bridges_urp if( pMTI->m_pMethodType && pMTI->m_pMethodType->pReturnTypeRef->eTypeClass != typelib_TypeClass_VOID ) { - TYPELIB_DANGER_GET( &(pMTI->m_pReturnType), pMTI->m_pMethodType->pReturnTypeRef ); + TYPELIB_DANGER_GET( &(pMTI->m_pReturnType), pMTI->m_pMethodType->pReturnTypeRef ); } else if( pMTI->m_pAttributeType && ! pMTI->m_nArgCount ) { - TYPELIB_DANGER_GET( &(pMTI->m_pReturnType) , pMTI->m_pAttributeType->pAttributeTypeRef ); + TYPELIB_DANGER_GET( &(pMTI->m_pReturnType) , pMTI->m_pAttributeType->pAttributeTypeRef ); } // normal method @@ -901,10 +901,10 @@ namespace bridges_urp for( sal_Int32 i = 0 ; i < pMTI->m_nArgCount ; i ++ ) { pMTI->m_ppArgType[i] = 0; - TYPELIB_DANGER_GET( & ( pMTI->m_ppArgType[i] ) , pMTI->m_pMethodType->pParams[i].pTypeRef); + TYPELIB_DANGER_GET( & ( pMTI->m_ppArgType[i] ) , pMTI->m_pMethodType->pParams[i].pTypeRef); pMTI->m_pbIsIn[i] = pMTI->m_pMethodType->pParams[i].bIn; pMTI->m_pbIsOut[i] = pMTI->m_pMethodType->pParams[i].bOut; - + pSJE->m_ppArgs[i] = getHeap( pMTI->m_ppArgType[i]->nSize ); if( pMTI->m_pbIsIn[i] ) { diff --git a/bridges/source/remote/urp/urp_job.hxx b/bridges/source/remote/urp/urp_job.hxx index ed31e33c387b..08bc43f89184 100644 --- a/bridges/source/remote/urp/urp_job.hxx +++ b/bridges/source/remote/urp/urp_job.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,12 +45,12 @@ const sal_Int32 MULTIJOB_PER_CALL_MEMORY_SIZE = 96; class Unmarshal; struct urp_BridgeImpl; -template < class t > +template < class t > inline t mymax( const t &t1 , const t &t2 ) { return t1 > t2 ? t1 : t2; } - + class Job { public: @@ -80,7 +80,7 @@ public: public: remote_Context *m_pContext; Unmarshal *m_pUnmarshal; - struct urp_BridgeImpl *m_pBridgeImpl; + struct urp_BridgeImpl *m_pBridgeImpl; sal_Sequence *m_pTid; ::bridges_remote::RemoteThreadCounter m_counter; }; @@ -92,17 +92,17 @@ public: inline ClientJob( uno_Environment *pEnvRemote, // weak ! remote_Context *pContext, struct urp_BridgeImpl *pBridgeImpl, - rtl_uString *pOid, // weak - typelib_TypeDescription const * pMemberType, // weak + rtl_uString *pOid, // weak + typelib_TypeDescription const * pMemberType, // weak typelib_InterfaceTypeDescription *pInterfaceType, // weak void *pReturn, void *ppArgs[], - uno_Any **ppException ); + uno_Any **ppException ); // ~ClientJob // no release for method type and attribute type necessary, because // it was acquired by the caller of urp_sendRequest. The lifetime - // of the ClientJob object is always shorter than the urp_sendRequest call. + // of the ClientJob object is always shorter than the urp_sendRequest call. inline ~ClientJob() { if( m_bReleaseForTypeDescriptionNecessary ) @@ -134,7 +134,7 @@ private: void *m_pReturn; typelib_InterfaceTypeDescription *m_pInterfaceType; sal_Bool m_bReleaseForTypeDescriptionNecessary; - + uno_Any **m_ppException; sal_Bool m_bOneway; sal_Bool m_bBridgePropertyCall; @@ -158,7 +158,7 @@ struct MemberTypeInfo typelib_TypeDescription **m_ppArgType; }; - + struct ServerJobEntry { rtl_uString *m_pOid; @@ -201,7 +201,7 @@ public: m_aTypeInfo[m_nCalls].m_bIsReleaseCall = bIsReleaseCall; m_aTypeInfo[m_nCalls].m_bIsOneway = bIsOneway; } - + inline void setAttributeType( typelib_InterfaceAttributeTypeDescription *pAttributeType, sal_Bool bIsSetter, sal_Bool bIsOneway ) { @@ -221,13 +221,13 @@ public: pTypeRef ); } // setOid or setInterface MUST be called before extract - inline void setOid( rtl_uString *pOid ) + inline void setOid( rtl_uString *pOid ) { m_aEntries[m_nCalls].m_pOid = pOid; rtl_uString_acquire( m_aEntries[m_nCalls].m_pOid ); m_aEntries[m_nCalls].m_pRemoteI = 0; } - + // setOid or setInterface MUST be called inline void setInterface( remote_Interface *pRemoteI ) { @@ -258,7 +258,7 @@ public: m_lstMem.push_back( m_pCurrentMem ); m_nCurrentMemSize = mymax( nSizeToAlloc , MULTIJOB_STANDARD_MEMORY_SIZE ) + (m_nMaxMessages -m_nCalls)*MULTIJOB_PER_CALL_MEMORY_SIZE; - m_pCurrentMem = (sal_Int8*) rtl_allocateMemory( m_nCurrentMemSize ); + m_pCurrentMem = (sal_Int8*) rtl_allocateMemory( m_nCurrentMemSize ); m_nCurrentMemPosition = 0; } sal_Int8 *pHeap = m_pCurrentMem + m_nCurrentMemPosition; @@ -277,7 +277,7 @@ private: uno_Environment *m_pEnvRemote; sal_Int32 m_nCalls; sal_Int32 m_nMaxMessages; - + ServerJobEntry *m_aEntries; MemberTypeInfo *m_aTypeInfo; @@ -306,7 +306,7 @@ inline ClientJob::ClientJob( pEnvRemote, pContext, pBridgeImpl, ::bridges_remote::RTC_HOLDENVWEAK ) , m_ppArgs( ppArgs ) , m_pReturn( pReturn ) - , m_pInterfaceType( pInterfaceType ) // weak + , m_pInterfaceType( pInterfaceType ) // weak , m_bReleaseForTypeDescriptionNecessary( sal_False ) , m_ppException( ppException ) , m_bBridgePropertyCall( sal_False ) @@ -341,7 +341,7 @@ inline ClientJob::ClientJob( } m_nMethodIndex = (sal_uInt16) m_pInterfaceType->pMapMemberIndexToFunctionIndex[ ((typelib_InterfaceMemberTypeDescription*)pMemberType)->nPosition ]; - + if( m_pAttributeType && m_ppArgs ) { // setter @@ -350,12 +350,12 @@ inline ClientJob::ClientJob( if( typelib_TypeClass_INTERFACE_METHOD == pMemberType->eTypeClass ) { -// if( (( typelib_InterfaceMemberTypeDescription * ) pMemberType)->nPosition -// == REMOTE_RELEASE_METHOD_INDEX ) -// { -// m_bOneway = sal_True; -// } -// else +// if( (( typelib_InterfaceMemberTypeDescription * ) pMemberType)->nPosition +// == REMOTE_RELEASE_METHOD_INDEX ) +// { +// m_bOneway = sal_True; +// } +// else if( pBridgeImpl->m_properties.bForceSynchronous ) { m_bOneway = sal_False; diff --git a/bridges/source/remote/urp/urp_log.cxx b/bridges/source/remote/urp/urp_log.cxx index cdaa1727e6b9..48c8543a8ebd 100644 --- a/bridges/source/remote/urp/urp_log.cxx +++ b/bridges/source/remote/urp/urp_log.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ namespace bridges_urp MutexGuard guard; FILE *f; }; - + void urp_logCall( urp_BridgeImpl *pBridgeImpl, sal_Int32 nSize, sal_Int32 nUseData, sal_Bool bSynchron , const ::rtl::OUString &sMethodName ) { diff --git a/bridges/source/remote/urp/urp_log.hxx b/bridges/source/remote/urp/urp_log.hxx index 8eb3751932a6..cc352e85f848 100644 --- a/bridges/source/remote/urp/urp_log.hxx +++ b/bridges/source/remote/urp/urp_log.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ namespace bridges_urp #ifdef DBG_UTIL #define BRIDGES_URP_PROT #endif - + #ifdef BRIDGES_URP_PROT void urp_logCall( urp_BridgeImpl *pBridgeImpl , sal_Int32 nSize, sal_Int32 nUseData, sal_Bool bSynchron , diff --git a/bridges/source/remote/urp/urp_marshal.cxx b/bridges/source/remote/urp/urp_marshal.cxx index ae23cfb87eb5..29f8b35cec0f 100644 --- a/bridges/source/remote/urp/urp_marshal.cxx +++ b/bridges/source/remote/urp/urp_marshal.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,9 +43,9 @@ using namespace ::com::sun::star::uno; namespace bridges_urp { -static int g_nDetectLittleEndian = 1; +static int g_nDetectLittleEndian = 1; char g_bMarshalSystemIsLittleEndian = ((char*)&g_nDetectLittleEndian)[0]; - + Marshal::Marshal( urp_BridgeImpl *pBridgeImpl, sal_Int32 nBufferSize, urp_extractOidCallback callback) : @@ -96,7 +96,7 @@ void Marshal::packTid( const ByteSequence & threadId, sal_Bool bIgnoreCache ) { nIndex = m_pBridgeImpl->m_tidCacheOut.seek( threadId ); } - + if( 0xffff == nIndex ) { if( ! bIgnoreCache ) @@ -117,11 +117,11 @@ void Marshal::packType( void *pSource ) { typelib_TypeDescriptionReference *pRef = *(typelib_TypeDescriptionReference ** ) pSource; - + OSL_ASSERT( pRef ); - + sal_uInt8 nTypeClass = ( sal_uInt8 ) pRef->eTypeClass; - + if( nTypeClass <= /* any*/ 14 ) { packInt8( (sal_Int8*)&nTypeClass ); @@ -130,7 +130,7 @@ void Marshal::packType( void *pSource ) { OUString sTypeName; sal_uInt16 nIndex = 0xffff; - + nIndex = m_pBridgeImpl->m_typeCacheOut.seek( *(Type*)&pRef ); if( 0xffff == nIndex ) { @@ -155,7 +155,7 @@ sal_Bool Marshal::packRecursive( void *pSource , typelib_TypeDescription *pType { case typelib_TypeClass_EXCEPTION: case typelib_TypeClass_STRUCT: - { + { typelib_CompoundTypeDescription * pCompType = (typelib_CompoundTypeDescription*)pType; if (pCompType->pBaseTypeDescription) @@ -167,7 +167,7 @@ sal_Bool Marshal::packRecursive( void *pSource , typelib_TypeDescription *pType typelib_TypeDescriptionReference ** ppTypeRefs = pCompType->ppTypeRefs; sal_Int32 * pMemberOffsets = pCompType->pMemberOffsets; sal_Int32 nDescr = pCompType->nMembers; - + for ( sal_Int32 nPos = 0; nPos < nDescr; ++nPos ) { typelib_TypeDescription * pMemberType = 0; @@ -192,10 +192,10 @@ sal_Bool Marshal::packRecursive( void *pSource , typelib_TypeDescription *pType { typelib_IndirectTypeDescription *pIndirectType = ( typelib_IndirectTypeDescription* ) pType; - - const sal_Int32 nElements = (*(uno_Sequence **)pSource)->nElements; - char * pSourceElements = (char *)(*(uno_Sequence **)pSource)->elements; - + + const sal_Int32 nElements = (*(uno_Sequence **)pSource)->nElements; + char * pSourceElements = (char *)(*(uno_Sequence **)pSource)->elements; + if( typelib_TypeClass_BYTE == pIndirectType->pType->eTypeClass ) { // Byte sequences are optimized @@ -207,8 +207,8 @@ sal_Bool Marshal::packRecursive( void *pSource , typelib_TypeDescription *pType TYPELIB_DANGER_GET( &pElementType, pIndirectType->pType ); if( pElementType ) { - const sal_Int32 nElementSize = pElementType->nSize; - + const sal_Int32 nElementSize = pElementType->nSize; + packCompressedSize( nElements ); for ( sal_Int32 i = 0 ; i < nElements; i++ ) { diff --git a/bridges/source/remote/urp/urp_marshal.hxx b/bridges/source/remote/urp/urp_marshal.hxx index f66528d74703..c4ed70e9bbbd 100644 --- a/bridges/source/remote/urp/urp_marshal.hxx +++ b/bridges/source/remote/urp/urp_marshal.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace bridges_urp // methods for accessing marshaling buffer inline void Marshal::finish( sal_Int32 nMessageCount ) { - sal_Int32 nSize = getSize() - 2*sizeof( sal_Int32 ); + sal_Int32 nSize = getSize() - 2*sizeof( sal_Int32 ); // save the state sal_Int8 *pos = m_pos; @@ -53,7 +53,7 @@ namespace bridges_urp // reset the state m_pos = pos; } - + inline void Marshal::restart() { m_pos = m_base + 2*sizeof( sal_Int32 ); @@ -63,7 +63,7 @@ namespace bridges_urp { return m_base; } - + inline sal_Bool Marshal::empty() const { return ( m_pos - m_base ) == 2*sizeof( sal_Int32 ); @@ -73,7 +73,7 @@ namespace bridges_urp { return ((sal_Int32) (m_pos - m_base)); } - + inline void Marshal::ensureAdditionalMem( sal_Int32 nMemToAdd ) { sal_Int32 nDiff = m_pos - m_base; @@ -82,7 +82,7 @@ namespace bridges_urp m_nBufferSize = m_nBufferSize * 2 > nDiff + nMemToAdd ? m_nBufferSize* 2 : nDiff + nMemToAdd; - + m_base = ( sal_Int8 * ) rtl_reallocateMemory( m_base , m_nBufferSize ); m_pos = m_base + nDiff; } @@ -115,12 +115,12 @@ namespace bridges_urp inline void Marshal::packByteSequence( sal_Int8 *pData , sal_Int32 nLength ) { packCompressedSize( nLength ); - + ensureAdditionalMem( nLength ); memcpy( m_pos , pData , nLength ); m_pos += nLength; } - + inline void Marshal::packString( void *pSource ) { rtl_uString *p = *( rtl_uString ** ) pSource; @@ -130,9 +130,9 @@ namespace bridges_urp ::rtl::OString o = ::rtl::OUStringToOString( p , RTL_TEXTENCODING_UTF8 ); sal_Int32 nLength = o.pData->length; packCompressedSize( nLength ); - + ensureAdditionalMem( nLength ); - + memcpy( m_pos , o.pData->buffer , nLength ); m_pos += nLength; } @@ -262,7 +262,7 @@ namespace bridges_urp m_pos += 8; break; } - + case typelib_TypeClass_STRING: { packString( pSource ); @@ -293,7 +293,7 @@ namespace bridges_urp if( pRemoteI ) { m_callback( pRemoteI , &(sOid.pData) ); - + nIndex = m_pBridgeImpl->m_oidCacheOut.seek( sOid ); if( 0xffff == nIndex ) { diff --git a/bridges/source/remote/urp/urp_marshal_decl.hxx b/bridges/source/remote/urp/urp_marshal_decl.hxx index a07f6ea48f5a..411730bacf2f 100644 --- a/bridges/source/remote/urp/urp_marshal_decl.hxx +++ b/bridges/source/remote/urp/urp_marshal_decl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace bridges_urp { struct urp_BridgeImpl; - + typedef void ( SAL_CALL * urp_extractOidCallback )( remote_Interface *pRemoteI, rtl_uString **ppOid ); @@ -50,11 +50,11 @@ namespace bridges_urp urp_extractOidCallback callback = 0 ); ~Marshal( ); - + inline sal_Bool pack( void *pSource , typelib_TypeDescription *pType ); sal_Bool packRecursive( void *pSource, typelib_TypeDescription *pType ); - + void packTid( const ::rtl::ByteSequence &id, sal_Bool bIgnoreCache = sal_False ); void packOid( const ::rtl::OUString &oid ); void packType( void *pSource ); @@ -80,25 +80,25 @@ namespace bridges_urp // a new marshalling session is started invalidating // the previous bufer inline void restart(); - + // is only valid, after finish has been called. // valid until destructed. inline sal_Int8 *getBuffer(); - + // is only valid, after finish has been called. // valid until destructed. inline sal_Int32 getSize(); - + inline sal_Int32 getPos() { return m_pos - m_base; } - + inline sal_Bool isSystemLittleEndian() { return g_bMarshalSystemIsLittleEndian; } - + private: inline void ensureAdditionalMem( sal_Int32 nMemToAdd ); sal_Int32 m_nBufferSize; - sal_Int8 *m_base; + sal_Int8 *m_base; sal_Int8 *m_pos; struct urp_BridgeImpl *m_pBridgeImpl; urp_extractOidCallback m_callback; diff --git a/bridges/source/remote/urp/urp_property.hxx b/bridges/source/remote/urp/urp_property.hxx index 0cd5525e63ad..530cea697e56 100644 --- a/bridges/source/remote/urp/urp_property.hxx +++ b/bridges/source/remote/urp/urp_property.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/bridges/source/remote/urp/urp_propertyobject.cxx b/bridges/source/remote/urp/urp_propertyobject.cxx index 323faee2e929..95c290ef08f0 100644 --- a/bridges/source/remote/urp/urp_propertyobject.cxx +++ b/bridges/source/remote/urp/urp_propertyobject.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ static void SAL_CALL staticAcquire( remote_Interface *pRemoteI ) PropertyObject *pProperties = (PropertyObject *) pRemoteI; pProperties->thisAcquire(); } - + static void SAL_CALL staticRelease( remote_Interface *pRemoteI ) { PropertyObject *pProperties = (PropertyObject *) pRemoteI; @@ -76,7 +76,7 @@ static void SAL_CALL staticDispatch( namespace bridges_urp { -// some nice constants .... +// some nice constants .... static const sal_Int32 METHOD_QUERY_INTERFACE = 0; static const sal_Int32 METHOD_GET_PROPERTIES = 3; static const sal_Int32 METHOD_REQUEST_CHANGE = 4; @@ -118,9 +118,9 @@ const sal_Char *g_aPropertyName[] = "ForceSynchronous", "CurrentContext" }; - + // nice little helper functions for conversion -template< class t > +template< class t > void assignToIdl( ProtocolProperty *pIdl, sal_Int32 nIndex, const t &value ) { pIdl->Name = OUString::createFromAscii( g_aPropertyName[nIndex] ); @@ -173,7 +173,7 @@ static sal_Bool assignFromIdlToStruct( Properties *pProps, const ProtocolPropert case PROPERTY_SUPPORTSMULTIPLESYNCHRONOUS: assignFromIdl( &(pProps->bSupportsMultipleSynchronous) , idl ); break; - case PROPERTY_SUPPERTSSYNCHRONOUS: + case PROPERTY_SUPPERTSSYNCHRONOUS: assignFromIdl( &(pProps->bSupportsMustReply) , idl ); break; case PROPERTY_SUPPORTSMUSTREPLY: @@ -249,7 +249,7 @@ static void assignFromStringToPropSeq( const OUString &sProps, uno_Sequence **pp { ::std::list< OUString > lst; extractTokens( sProps , lst ); - + typelib_TypeDescription *pSequenceType = 0; getCppuType( (Sequence< ProtocolProperty > *)0).getDescription( &pSequenceType ); uno_Sequence *pSeq = 0; @@ -302,7 +302,7 @@ static void assignFromStringToPropSeq( const OUString &sProps, uno_Sequence **pp break; } - // strings + // strings case PROPERTY_VERSION: assignToIdl( &(pElements[i]) , nIndex , sValue ); break; @@ -362,7 +362,7 @@ void SAL_CALL PropertyObject::thisDispatch( uno_Any ** ppException ) { OSL_ASSERT( pMemberType->eTypeClass == typelib_TypeClass_INTERFACE_METHOD ); - + typelib_InterfaceMethodTypeDescription *pMethodType = ( typelib_InterfaceMethodTypeDescription * ) pMemberType; @@ -403,12 +403,12 @@ void SAL_CALL PropertyObject::localGetPropertiesFromRemote( struct Properties *p { typelib_typedescription_complete( &pInterfaceType ); } - + typelib_TypeDescription *pMethodType = 0; typelib_typedescriptionreference_getDescription( &pMethodType, ((typelib_InterfaceTypeDescription*) pInterfaceType)->ppAllMembers[METHOD_GET_PROPERTIES] ); - + uno_Sequence *pResult = 0; uno_Any exception; @@ -442,7 +442,7 @@ void SAL_CALL PropertyObject::localGetPropertiesFromRemote( struct Properties *p } -// implementation for call from remote +// implementation for call from remote void SAL_CALL PropertyObject::implGetProperties( uno_Sequence **ppReturnValue ) { typelib_TypeDescription *pElementType= 0; @@ -467,7 +467,7 @@ void SAL_CALL PropertyObject::implGetProperties( uno_Sequence **ppReturnValue ) assignToIdl( &(pElements[PROPERTY_SUPPERTSSYNCHRONOUS]), PROPERTY_SUPPERTSSYNCHRONOUS, pP->bSupportsSynchronous ); assignToIdl( &(pElements[PROPERTY_SUPPORTSMULTIPLESYNCHRONOUS]), PROPERTY_SUPPORTSMULTIPLESYNCHRONOUS, pP->bSupportsMultipleSynchronous ); assignToIdl( &(pElements[PROPERTY_CLEARCACHE]), PROPERTY_CLEARCACHE, pP->bClearCache ); - + typelib_typedescription_release( pElementType ); } @@ -497,20 +497,20 @@ sal_Int32 SAL_CALL PropertyObject::localRequestChange( ) rtl_random_destroyPool( pool ); } } - + if( bCall ) { OUString oid = OUString::createFromAscii( g_NameOfUrpProtocolPropertiesObject ); - // gather types for calling + // gather types for calling typelib_TypeDescription *pInterfaceType = 0; getCppuType( (Reference< XProtocolProperties > *) 0 ).getDescription( &pInterfaceType ); - + if( !pInterfaceType->bComplete ) { typelib_typedescription_complete( &pInterfaceType ); } - + typelib_TypeDescription *pMethodType = 0; typelib_typedescriptionreference_getDescription( &pMethodType, @@ -518,10 +518,10 @@ sal_Int32 SAL_CALL PropertyObject::localRequestChange( ) void *pArg1 = &m_nRandomNumberOfRequest; void **ppArgs = &pArg1; - + uno_Any exception; uno_Any *pException = &exception; - + ClientJob job( m_pEnvRemote, 0, m_pBridgeImpl, @@ -546,7 +546,7 @@ sal_Int32 SAL_CALL PropertyObject::localRequestChange( ) if( bSuccess ) { job.wait(); - + if( pException ) { // the object is unknown on the other side. @@ -570,7 +570,7 @@ sal_Int32 SAL_CALL PropertyObject::localRequestChange( ) return nResult; } -// implementation for call from remote +// implementation for call from remote sal_Int32 SAL_CALL PropertyObject::implRequestChange( sal_Int32 nRandomNumber, uno_Any **ppException ) { sal_Int32 nResult = 0; @@ -616,13 +616,13 @@ void SAL_CALL PropertyObject::localCommitChange( const ::rtl::OUString &sProps , // The remote counterpart cannot if the call following the commit already uses // the new properties or not. MutexGuard guard( m_pBridgeImpl->m_marshalingMutex ); - + OUString oid = OUString::createFromAscii( g_NameOfUrpProtocolPropertiesObject ); osl_resetCondition( m_commitChangeCondition ); Properties props = *m_pLocalSetting; - + typelib_TypeDescription *pInterfaceType = 0; getCppuType( (Reference< XProtocolProperties > *) 0 ).getDescription( &pInterfaceType ); @@ -630,75 +630,75 @@ void SAL_CALL PropertyObject::localCommitChange( const ::rtl::OUString &sProps , { typelib_typedescription_complete( &pInterfaceType ); } - + typelib_TypeDescription *pMethodType = 0; typelib_typedescriptionreference_getDescription( &pMethodType, ((typelib_InterfaceTypeDescription*) pInterfaceType)->ppAllMembers[METHOD_COMMIT_CHANGE] ); + +// typelib_TypeDescription *pSequenceType= 0; -// typelib_TypeDescription *pSequenceType= 0; - - + // extract name/value pairs uno_Sequence *pSeq = 0; assignFromStringToPropSeq( sProps, &pSeq ); assignFromPropSeqToStruct( pSeq , &props ); -// ::std::list< OUString > lst; -// extractTokens( sProps , lst ); - -// getCppuType( (Sequence< ProtocolProperty > *)0).getDescription( &pSequenceType ); -// uno_sequence_construct( &pSeq , pSequenceType , 0, lst.size() , 0 ); -// ProtocolProperty *pElements = (ProtocolProperty * ) pSeq->elements; - -// sal_Int32 i = 0; -// for( ::std::list< OUString >::iterator ii = lst.begin() ; ii != lst.end() ; ++ ii, i++ ) -// { -// sal_Int32 nAssign = (*ii).indexOf( '=' ); -// if( -1 == nAssign ) -// { -// OString o = OUStringToOString( *ii, RTL_TEXTENCODING_ASCII_US ); -// OSL_ENSURE( !"wrong protocol propertyt format, ignored", o.getStr() ); -// } -// OUString sPropName = (*ii).copy( 0, nAssign ); -// OUString sValue = (*ii).copy( nAssign +1, (*ii).getLength() - nAssign -1 ); - -// sal_Int32 nIndex = getIndexFromString( sPropName ); -// if( -1 == nIndex ) -// { -// OString o = OUStringToOString( sPropName , RTL_TEXTENCODING_ASCII_US); -// OSL_ENSURE( !"unknown protocol property, ignored", o.getStr() ); -// } -// switch( nIndex ) -// { -// // bools -// case PROPERTY_CLEARCACHE: -// { -// sal_Bool bClearCache = (sal_Bool ) sValue.toInt32(); -// assignToIdl( &(pElements[i]) , nIndex , bClearCache ); -// break; -// } -// // ints -// case PROPERTY_TYPECACHESIZE: -// case PROPERTY_OIDCACHESIZE: -// case PROPERTY_TIDCACHESIZE: -// case PROPERTY_FLUSHBLOCKSIZE: -// case PROPERTY_ONEWAYTIMEOUT_MUSEC: -// { -// sal_Int32 nValue = sValue.toInt32(); -// assignToIdl( &(pElements[i]) , nIndex , nValue ); -// break; -// } - -// // strings -// case PROPERTY_VERSION: -// assignToIdl( &(pElements[i]) , nIndex , sValue ); -// break; -// default: -// OString o = OUStringToOString( sPropName, RTL_TEXTENCODING_ASCII_US ); -// OSL_ENSURE( !"readonly protocol property, ignored" , o.getStr() ); -// } -// assignFromIdlToStruct( &props, pElements[i] ); -// } +// ::std::list< OUString > lst; +// extractTokens( sProps , lst ); + +// getCppuType( (Sequence< ProtocolProperty > *)0).getDescription( &pSequenceType ); +// uno_sequence_construct( &pSeq , pSequenceType , 0, lst.size() , 0 ); +// ProtocolProperty *pElements = (ProtocolProperty * ) pSeq->elements; + +// sal_Int32 i = 0; +// for( ::std::list< OUString >::iterator ii = lst.begin() ; ii != lst.end() ; ++ ii, i++ ) +// { +// sal_Int32 nAssign = (*ii).indexOf( '=' ); +// if( -1 == nAssign ) +// { +// OString o = OUStringToOString( *ii, RTL_TEXTENCODING_ASCII_US ); +// OSL_ENSURE( !"wrong protocol propertyt format, ignored", o.getStr() ); +// } +// OUString sPropName = (*ii).copy( 0, nAssign ); +// OUString sValue = (*ii).copy( nAssign +1, (*ii).getLength() - nAssign -1 ); + +// sal_Int32 nIndex = getIndexFromString( sPropName ); +// if( -1 == nIndex ) +// { +// OString o = OUStringToOString( sPropName , RTL_TEXTENCODING_ASCII_US); +// OSL_ENSURE( !"unknown protocol property, ignored", o.getStr() ); +// } +// switch( nIndex ) +// { +// // bools +// case PROPERTY_CLEARCACHE: +// { +// sal_Bool bClearCache = (sal_Bool ) sValue.toInt32(); +// assignToIdl( &(pElements[i]) , nIndex , bClearCache ); +// break; +// } +// // ints +// case PROPERTY_TYPECACHESIZE: +// case PROPERTY_OIDCACHESIZE: +// case PROPERTY_TIDCACHESIZE: +// case PROPERTY_FLUSHBLOCKSIZE: +// case PROPERTY_ONEWAYTIMEOUT_MUSEC: +// { +// sal_Int32 nValue = sValue.toInt32(); +// assignToIdl( &(pElements[i]) , nIndex , nValue ); +// break; +// } + +// // strings +// case PROPERTY_VERSION: +// assignToIdl( &(pElements[i]) , nIndex , sValue ); +// break; +// default: +// OString o = OUStringToOString( sPropName, RTL_TEXTENCODING_ASCII_US ); +// OSL_ENSURE( !"readonly protocol property, ignored" , o.getStr() ); +// } +// assignFromIdlToStruct( &props, pElements[i] ); +// } void *pArg1 = &pSeq; uno_Any exception; @@ -722,7 +722,7 @@ void SAL_CALL PropertyObject::localCommitChange( const ::rtl::OUString &sProps , { OSL_ASSERT( pException != NULL ); } - + ::uno_type_destructData( &pSeq, getCppuType( (Sequence< ProtocolProperty > *)0).getTypeLibType(), 0 ); @@ -748,7 +748,7 @@ void SAL_CALL PropertyObject::localCommitChange( const ::rtl::OUString &sProps , typelib_typedescription_release( pMethodType ); typelib_typedescription_release( pInterfaceType ); } - + void SAL_CALL PropertyObject::implCommitChange( uno_Sequence *pSequence, uno_Any **ppException ) { MutexGuard guard( m_mutex ); diff --git a/bridges/source/remote/urp/urp_propertyobject.hxx b/bridges/source/remote/urp/urp_propertyobject.hxx index d6cfbc84ff95..49628f522e3d 100644 --- a/bridges/source/remote/urp/urp_propertyobject.hxx +++ b/bridges/source/remote/urp/urp_propertyobject.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace bridges_urp { struct urp_BridgeImpl; const sal_Char g_NameOfUrpProtocolPropertiesObject[] = "UrpProtocolProperties"; -// helper functions +// helper functions void assignFromStringToStruct( const ::rtl::OUString & sProps , struct Properties *pProps ); class PropertyObject : public remote_Interface @@ -49,17 +49,17 @@ class PropertyObject : public remote_Interface private: ::osl::Mutex m_mutex; oslCondition m_commitChangeCondition; - oslInterlockedCount m_nRefCount; + oslInterlockedCount m_nRefCount; urp_BridgeImpl *m_pBridgeImpl; struct Properties *m_pLocalSetting; struct Properties m_propsToBeApplied; - + uno_Environment *m_pEnvRemote; sal_Int32 m_nRandomNumberOfRequest; sal_Bool m_bRequestChangeHasBeenCalled; sal_Bool m_bServerWaitingForCommit; sal_Bool m_bApplyProperties; - + public: PropertyObject( struct Properties *pLocalSetting , uno_Environment *pEnvRemote, urp_BridgeImpl *pImpl ); @@ -83,7 +83,7 @@ public: void * pArgs[], uno_Any ** ppException ); -public: // local +public: // local sal_Int32 SAL_CALL localRequestChange( ); void SAL_CALL localCommitChange( const ::rtl::OUString &properties, sal_Bool *pbExceptionThrown ); void SAL_CALL localGetPropertiesFromRemote( struct Properties * ); @@ -92,9 +92,9 @@ public: // local inline sal_Bool SAL_CALL changesHaveBeenCommited() { return m_bApplyProperties; } Properties SAL_CALL getCommitedChanges(); - + void SAL_CALL waitUntilChangesAreCommitted(); - + protected: // these methods are called by thisDispatch void SAL_CALL implGetProperties( uno_Sequence **ppReturnValue ); diff --git a/bridges/source/remote/urp/urp_reader.cxx b/bridges/source/remote/urp/urp_reader.cxx index 00941c468e1b..1dfaf30d4d1f 100644 --- a/bridges/source/remote/urp/urp_reader.cxx +++ b/bridges/source/remote/urp/urp_reader.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ namespace bridges_urp ***/ void SAL_CALL urp_releaseRemoteCallback ( remote_Interface *, rtl_uString *pOid, - typelib_TypeDescriptionReference *pTypeRef, uno_Environment *pEnvRemote ) + typelib_TypeDescriptionReference *pTypeRef, uno_Environment *pEnvRemote ) { remote_Context *pContext = (remote_Context *) pEnvRemote->pContext; urp_BridgeImpl *pImpl = (urp_BridgeImpl*) ( pContext->m_pBridgeImpl ); @@ -758,7 +758,7 @@ void OReaderThread::run() pLastRemoteI = 0; } ClientJob *pClientJob = - m_pBridgeImpl->m_clientJobContainer.remove( *( ByteSequence * )ppLastTid ); + m_pBridgeImpl->m_clientJobContainer.remove( *( ByteSequence * )ppLastTid ); // Bridge MUST be already disposed, otherwise we got a wrong threadid // from remote ! diff --git a/bridges/source/remote/urp/urp_reader.hxx b/bridges/source/remote/urp/urp_reader.hxx index aa4042ce197b..409cce526caf 100644 --- a/bridges/source/remote/urp/urp_reader.hxx +++ b/bridges/source/remote/urp/urp_reader.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ typedef struct _uno_Environment uno_Environment; namespace bridges_urp { - + class OWriterThread; struct MessageFlags; @@ -46,9 +46,9 @@ public: uno_Environment *pEnvRemote, OWriterThread *pWriterThread ); ~OReaderThread(); - + // may only be called in the callstack of this thread !!!!! - // run() -> disposeEnvironment() -> dispose() -> destroyYourself() + // run() -> disposeEnvironment() -> dispose() -> destroyYourself() void destroyYourself(); private: @@ -66,7 +66,7 @@ private: sal_Bool *pbIsSetter, sal_uInt16 nMethodId , typelib_TypeDescriptionReference *pITypeRef); - + remote_Connection *m_pConnection; uno_Environment *m_pEnvRemote; OWriterThread *m_pWriterThread; diff --git a/bridges/source/remote/urp/urp_replycontainer.hxx b/bridges/source/remote/urp/urp_replycontainer.hxx index c8b05ea47435..ff04a15a8f94 100644 --- a/bridges/source/remote/urp/urp_replycontainer.hxx +++ b/bridges/source/remote/urp/urp_replycontainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/bridges/source/remote/urp/urp_threadid.cxx b/bridges/source/remote/urp/urp_threadid.cxx index e603a73bab83..4554057d22a8 100644 --- a/bridges/source/remote/urp/urp_threadid.cxx +++ b/bridges/source/remote/urp/urp_threadid.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/bridges/source/remote/urp/urp_threadid.hxx b/bridges/source/remote/urp/urp_threadid.hxx index e920e2c1e9c3..d26b1cdc0af9 100644 --- a/bridges/source/remote/urp/urp_threadid.hxx +++ b/bridges/source/remote/urp/urp_threadid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace bridges_urp struct HashThreadId { - sal_Int32 operator () ( const ::rtl::ByteSequence &a ) const + sal_Int32 operator () ( const ::rtl::ByteSequence &a ) const { if( a.getLength() >= 4 ) { diff --git a/bridges/source/remote/urp/urp_unmarshal.cxx b/bridges/source/remote/urp/urp_unmarshal.cxx index 5fd124017d4a..43802bc78d8a 100644 --- a/bridges/source/remote/urp/urp_unmarshal.cxx +++ b/bridges/source/remote/urp/urp_unmarshal.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/bridges/source/remote/urp/urp_unmarshal.hxx b/bridges/source/remote/urp/urp_unmarshal.hxx index 04881d456cce..07b03b606641 100644 --- a/bridges/source/remote/urp/urp_unmarshal.hxx +++ b/bridges/source/remote/urp/urp_unmarshal.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ struct urp_BridgeImpl; void SAL_CALL urp_releaseRemoteCallback( remote_Interface *pRemoteI,rtl_uString *pOid, typelib_TypeDescriptionReference *pTypeRef, - uno_Environment *pEnvRemote ); + uno_Environment *pEnvRemote ); struct UnpackItem { diff --git a/bridges/source/remote/urp/urp_writer.cxx b/bridges/source/remote/urp/urp_writer.cxx index 58795d9f3359..38f85a7c4194 100644 --- a/bridges/source/remote/urp/urp_writer.cxx +++ b/bridges/source/remote/urp/urp_writer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/bridges/source/remote/urp/urp_writer.hxx b/bridges/source/remote/urp/urp_writer.hxx index 041f0b4d753f..f491bc9aadbc 100644 --- a/bridges/source/remote/urp/urp_writer.hxx +++ b/bridges/source/remote/urp/urp_writer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace bridges_urp ::rtl::OUString sOid; ::com::sun::star::uno::Type typeInterface; }; - + struct urp_BridgeImpl; class OWriterThread : public ::osl::Thread @@ -55,18 +55,18 @@ namespace bridges_urp urp_BridgeImpl *m_pBridgeImpl, uno_Environment *pEnvRemote); ~OWriterThread( ); - + virtual void SAL_CALL run(); - + void touch( sal_Bool bImmediately ); void sendEmptyMessage(); - + void abortThread(); void SAL_CALL insertReleaseRemoteCall ( rtl_uString *pOid,typelib_TypeDescriptionReference *pTypeRef); void SAL_CALL executeReleaseRemoteCalls(); - + private: void write(); oslCondition m_oslCondition; |