diff options
Diffstat (limited to 'bridges/inc/bridges')
19 files changed, 62 insertions, 62 deletions
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index b5dfd5d28168..3e0c48807305 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/bridge.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 @@ -291,17 +291,17 @@ inline cppu_Bridge::cppu_Bridge( , bExportCpp2Uno( bExportCpp2Uno_ ) { g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); - + aCpp2Uno.pBridge = this; aCpp2Uno.acquire = cppu_Mapping_acquire; aCpp2Uno.release = cppu_Mapping_release; aCpp2Uno.mapInterface = cppu_Mapping_cpp2uno; - + aUno2Cpp.pBridge = this; aUno2Cpp.acquire = cppu_Mapping_acquire; aUno2Cpp.release = cppu_Mapping_release; aUno2Cpp.mapInterface = cppu_Mapping_uno2cpp; - + (*((uno_Environment *)pCppEnv)->acquire)( (uno_Environment *)pCppEnv ); (*((uno_Environment *)pUnoEnv)->acquire)( (uno_Environment *)pUnoEnv ); } diff --git a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx b/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx index 542be6e0f3d6..f18520ec8d8f 100644 --- a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/arraypointer.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/inc/bridges/cpp_uno/shared/bridge.hxx b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx index 4ee69e37b416..35bf11d90915 100644 --- a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/bridge.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/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx index 31e19cc94d00..ffaada865ae2 100644 --- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.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/inc/bridges/cpp_uno/shared/types.hxx b/bridges/inc/bridges/cpp_uno/shared/types.hxx index 0cc87864af0e..bb3b4f7175b2 100644 --- a/bridges/inc/bridges/cpp_uno/shared/types.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/types.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/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx index 87c96ec36689..a3c89f9f3eae 100644 --- a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.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/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index 247b12aafb25..680dee6c0c98 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.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 @@ -39,7 +39,7 @@ /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \ - || defined(NETBSD) + || defined(NETBSD) #define USE_DOUBLE_MMAP #endif diff --git a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx b/bridges/inc/bridges/cpp_uno/shared/vtables.hxx index 2ea5c7c83121..f282f997becc 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtables.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/inc/bridges/cpp_uno/type_misc.hxx b/bridges/inc/bridges/cpp_uno/type_misc.hxx index 5fbd0da45cac..98fd84205588 100644 --- a/bridges/inc/bridges/cpp_uno/type_misc.hxx +++ b/bridges/inc/bridges/cpp_uno/type_misc.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 @@ inline bool cppu_relatesToInterface( typelib_TypeDescription * pTypeDescr ) SAL_ { switch (pTypeDescr->eTypeClass) { -// case typelib_TypeClass_TYPEDEF: +// case typelib_TypeClass_TYPEDEF: case typelib_TypeClass_SEQUENCE: { switch (((typelib_IndirectTypeDescription *)pTypeDescr)->pType->eTypeClass) @@ -78,7 +78,7 @@ inline bool cppu_relatesToInterface( typelib_TypeDescription * pTypeDescr ) SAL_ case typelib_TypeClass_UNION: // might relate to interface case typelib_TypeClass_ANY: // might relate to interface return true; -// case typelib_TypeClass_TYPEDEF: +// case typelib_TypeClass_TYPEDEF: case typelib_TypeClass_SEQUENCE: case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: diff --git a/bridges/inc/bridges/remote/bridgeimpl.hxx b/bridges/inc/bridges/remote/bridgeimpl.hxx index bb166d50a153..cff8effae72c 100644 --- a/bridges/inc/bridges/remote/bridgeimpl.hxx +++ b/bridges/inc/bridges/remote/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 @@ -50,7 +50,7 @@ namespace bridges_remote { { RTC_HOLDENVWEAK = 0x1 }; - + class RemoteThreadCounter { public: @@ -63,13 +63,13 @@ namespace bridges_remote { remote_Context *pContext = ((remote_Context *) m_pEnvRemote->pContext ); osl_incrementInterlockedCount( &( pContext->m_pBridgeImpl->m_nRemoteThreads ) ); } - + RemoteThreadCounter( uno_Environment *pEnvRemote ) : m_bReleaseEnvironment( sal_True ) , m_pEnvRemote( pEnvRemote ) { m_pEnvRemote->acquire( m_pEnvRemote ); - + remote_Context *pContext = ((remote_Context *) m_pEnvRemote->pContext ); osl_incrementInterlockedCount( &( pContext->m_pBridgeImpl->m_nRemoteThreads ) ); } @@ -86,7 +86,7 @@ namespace bridges_remote { if( m_bReleaseEnvironment ) m_pEnvRemote->release( m_pEnvRemote ); } - + sal_Bool m_bReleaseEnvironment; uno_Environment *m_pEnvRemote; }; diff --git a/bridges/inc/bridges/remote/connection.h b/bridges/inc/bridges/remote/connection.h index 9ed8fad10d02..6e85250d8234 100644 --- a/bridges/inc/bridges/remote/connection.h +++ b/bridges/inc/bridges/remote/connection.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 @@ -35,16 +35,16 @@ struct remote_Connection { void ( SAL_CALL * acquire ) ( remote_Connection *); - + void ( SAL_CALL * release ) ( remote_Connection *); - + /** reads nSize bytes from the connection. This method blocks, until all bytes are available or an error occurs. @return Number of bytes read. If the return value is less than nSize, an unrecoverable i/o error has occured or the connection was closed. - + */ sal_Int32 (SAL_CALL * read)(remote_Connection *, sal_Int8 *pDest, sal_Int32 nSize ); diff --git a/bridges/inc/bridges/remote/context.h b/bridges/inc/bridges/remote/context.h index 8ff83adfb128..d73f371c79a5 100644 --- a/bridges/inc/bridges/remote/context.h +++ b/bridges/inc/bridges/remote/context.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 @@ -41,7 +41,7 @@ Not all uno_Contexts need to be refcounted, in case they are, they should be 'derived' from this struct. - This is used as a base class for the remote_Context. + This is used as a base class for the remote_Context. @see uno_Environment @see uno_getEnvironment() @see remote_Context @@ -53,7 +53,7 @@ struct uno_Context void (SAL_CALL * acquire)( uno_Context *pContext ); /** decrements the recount of the context. In case the recount drops to zero, - the context gets destroye. + the context gets destroye. */ void (SAL_CALL * release)( uno_Context *pContext); @@ -70,7 +70,7 @@ struct remote_Interface; /** performs a query-interface for a certain interface via the remote connection ! - + @param pEnvRemote The environment, that shall perform the call. @param ppRemoteI in/out parameter contains the interface returned by queryInterface @param pOid the oid of the 'ghost' object on which the call must be done. @@ -99,7 +99,7 @@ struct remote_InstanceProvider /** refcounted C-interface, which allows to register a listener to an remote bridge to be informed when the bridge gets disposed. - + @see remote_Context */ struct remote_DisposingListener @@ -115,8 +115,8 @@ struct remote_DisposingListener Try to get an existing context characterized by the pIdString. Each ID-String must uniquely charcterize a certain connection. The context can't be retrieved via this function anymore, after it got disposed. - - @return 0 when such a context does not exist, otherwise + + @return 0 when such a context does not exist, otherwise a pointer to an acquired remote_Context. **/ extern "C" remote_Context * SAL_CALL @@ -125,19 +125,19 @@ remote_getContext( rtl_uString *pIdString ); /** Create an acquired remote context. The Context is weakly held by the context administration and can be accessed later through remote_getContext() (using the same id-string). - + @param pIdString A string, that uniquely describes the connection. For e.g. a socket connection, host and port of the local and remote host should be in the string. - + @param pDescription Description of the connection, that may brought up to the user. - + @param pProtocol The protocol, that the environment uses for communicating with the remote process. The format of the protocol string is : "protocolname,para1=para1value,..." @return 0, when a context with this name already exists. - + @see remote_getContext() @see remote_Context */ @@ -172,10 +172,10 @@ extern "C" void SAL_CALL remote_removeContextListener( remote_contextListenerFunc listener , void *pObject ); /** Allows to retrieve all existing context strings. - + @param pnStringCount out parameter. Contains the number of rtl_uStrings in the array @param memAlloc a memory allocation function for the array of pointers to rtl_uStrings - + @return array of rtl strings. The caller must call release on all rtl_uString s and must free the pointer array. */ @@ -204,9 +204,9 @@ struct remote_Context remote_DisposingListener * ); /** will be called by the environment when it gets disposed - */ + */ void ( SAL_CALL * dispose ) ( remote_Context * ); - + /** The method is set by the remote-environment during environment initialization. @see remote_getInstanceFunc */ @@ -218,7 +218,7 @@ struct remote_Context The parameters are protocol dependend */ rtl_uString *m_pProtocol; - + /** It may be the same as m_pName. Livetime is handled by the context administration. @@ -231,7 +231,7 @@ struct remote_Context Livetime is handled by the context administration. */ rtl_uString *m_pName; - + /** The instance-provider, which is used to look up unknown object identifiers. Is usually called on server side, when the first client request comes in. Maybe 0. Livetime is handled by the context administration. diff --git a/bridges/inc/bridges/remote/counter.hxx b/bridges/inc/bridges/remote/counter.hxx index 8bcb547008af..9dfd21dd416d 100644 --- a/bridges/inc/bridges/remote/counter.hxx +++ b/bridges/inc/bridges/remote/counter.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/inc/bridges/remote/helper.hxx b/bridges/inc/bridges/remote/helper.hxx index 56de06b7d8c8..3df820c36c94 100644 --- a/bridges/inc/bridges/remote/helper.hxx +++ b/bridges/inc/bridges/remote/helper.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 @@ -47,7 +47,7 @@ namespace bridges_remote /** @param callback If the bridge implementation wants to handle the remote release call, it can do it giving this callback. If callback == 0, the releaseRemote method of the stub is called. - */ + */ void SAL_CALL remote_createStub ( remote_Interface **ppRemoteI, rtl_uString *pOid , @@ -58,7 +58,7 @@ namespace bridges_remote void SAL_CALL remote_retrieveOidFromProxy( remote_Interface *pRemtoeI, rtl_uString **ppOid ); - + void SAL_CALL remote_sendQueryInterface( uno_Environment *pEnvRemote, remote_Interface **ppRemoteI, diff --git a/bridges/inc/bridges/remote/mapping.hxx b/bridges/inc/bridges/remote/mapping.hxx index 28903eff8ac2..8aefb477b24f 100644 --- a/bridges/inc/bridges/remote/mapping.hxx +++ b/bridges/inc/bridges/remote/mapping.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 @@ -43,12 +43,12 @@ namespace bridges_remote uno_Mapping *pMapping, void **ppOut, void *pInterface, typelib_InterfaceTypeDescription *pInterfaceTypeDescr ); RemoteToUno remoteToUno; - + extern "C" typedef void SAL_CALL UnoToRemote( uno_Mapping *pMapping, void **ppOut, void *pInterface, typelib_InterfaceTypeDescription *pInterfaceTypeDescr ); UnoToRemote unoToRemote; - + extern "C" typedef void SAL_CALL FreeRemoteMapping(uno_Mapping * mapping); FreeRemoteMapping freeRemoteMapping; @@ -61,11 +61,11 @@ namespace bridges_remote uno_MapInterfaceFunc func , const ::rtl::OUString sPurpose); ~RemoteMapping(); - - oslInterlockedCount m_nRef; + + oslInterlockedCount m_nRef; ::rtl::OUString m_sPurpose; }; - + } #endif diff --git a/bridges/inc/bridges/remote/proxy.hxx b/bridges/inc/bridges/remote/proxy.hxx index 25afecca6c13..c7c25652bc6e 100644 --- a/bridges/inc/bridges/remote/proxy.hxx +++ b/bridges/inc/bridges/remote/proxy.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 @@ -47,7 +47,7 @@ AcquireRemote2UnoProxy acquireRemote2UnoProxy; extern "C" typedef void SAL_CALL ReleaseRemote2UnoProxy(uno_Interface *); ReleaseRemote2UnoProxy releaseRemote2UnoProxy; -// private: +// private: extern "C" typedef void SAL_CALL DispatchRemote2UnoProxy( uno_Interface *, typelib_TypeDescription const *, void *, void **, uno_Any **); @@ -66,9 +66,9 @@ public: uno_Environment *pEnvUno, uno_Environment *pEnvRemote ); - + ~Remote2UnoProxy(); - + private: ::rtl::OUString m_sOid; typelib_InterfaceTypeDescription *m_pType; @@ -77,8 +77,8 @@ private: uno_Environment *m_pEnvRemote; ::com::sun::star::uno::Mapping m_mapRemote2Uno; ::com::sun::star::uno::Mapping m_mapUno2Remote; - - oslInterlockedCount m_nRef; + + oslInterlockedCount m_nRef; friend void SAL_CALL acquireRemote2UnoProxy(uno_Interface *); diff --git a/bridges/inc/bridges/remote/remote.h b/bridges/inc/bridges/remote/remote.h index 1e8ebabf2b93..49180a866ff4 100644 --- a/bridges/inc/bridges/remote/remote.h +++ b/bridges/inc/bridges/remote/remote.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 @@ -56,7 +56,7 @@ typedef void (SAL_CALL * remote_DispatchMethod)( remote_Interface * pRemoteI, typelib_TypeDescription const * pMemberType, void * pReturn, void * pArgs[], uno_Any ** ppException ); -/** +/** @internal */ typedef void ( SAL_CALL * requestClientSideDispatcher ) ( diff --git a/bridges/inc/bridges/remote/remote.hxx b/bridges/inc/bridges/remote/remote.hxx index a4fcac21f1c8..c773b6a2c7fb 100644 --- a/bridges/inc/bridges/remote/remote.hxx +++ b/bridges/inc/bridges/remote/remote.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/inc/bridges/remote/stub.hxx b/bridges/inc/bridges/remote/stub.hxx index b89389ec50fe..4c53b029149f 100644 --- a/bridges/inc/bridges/remote/stub.hxx +++ b/bridges/inc/bridges/remote/stub.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 @@ public: ::rtl::OUString m_sOid; typelib_InterfaceTypeDescription *m_pType; uno_Interface *m_pUnoI; - oslInterlockedCount m_nRef; + oslInterlockedCount m_nRef; uno_Environment *m_pEnvUno; uno_Environment *m_pEnvRemote; |