diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:38:47 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:38:47 +0000 |
commit | 4edcce8e47308e5c3700c24ff699cce338b8602f (patch) | |
tree | d8a634ad5560c29c338fb4b84899054576e57c04 /bridges | |
parent | d02f65a0d16e37a984cce6a471d0e846f9d15747 (diff) |
INTEGRATION: CWS warnings01 (1.1.1.1.270); FILE MERGED
2005/09/22 18:07:27 sb 1.1.1.1.270.2: RESYNC: (1.1.1.1-1.2); FILE MERGED
2005/09/09 12:37:22 sb 1.1.1.1.270.1: #i53898# Made code warning-free.
Diffstat (limited to 'bridges')
-rw-r--r-- | bridges/inc/bridges/remote/mapping.hxx | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/bridges/inc/bridges/remote/mapping.hxx b/bridges/inc/bridges/remote/mapping.hxx index e880e41f3d4a..55aae07b7108 100644 --- a/bridges/inc/bridges/remote/mapping.hxx +++ b/bridges/inc/bridges/remote/mapping.hxx @@ -4,9 +4,9 @@ * * $RCSfile: mapping.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 22:12:25 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:38:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,6 +46,19 @@ typedef struct _uno_Environment uno_Environment; namespace bridges_remote { + extern "C" typedef void SAL_CALL RemoteToUno( + 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; + class RemoteMapping : public remote_Mapping { @@ -56,22 +69,6 @@ namespace bridges_remote const ::rtl::OUString sPurpose); ~RemoteMapping(); - static void SAL_CALL thisFree( uno_Mapping * pMapping ); - static void SAL_CALL remoteToUno( - uno_Mapping *pMapping, - void **ppOut, - void *pInterface, - typelib_InterfaceTypeDescription *pInterfaceTypeDescr ); - - static void SAL_CALL unoToRemote( - uno_Mapping *pMapping, - void **ppOut, - void *pInterface, - typelib_InterfaceTypeDescription *pInterfaceTypeDescr ); - - static void SAL_CALL thisAcquire( uno_Mapping *pMapping ); - static void SAL_CALL thisRelease( uno_Mapping *pMapping ); - oslInterlockedCount m_nRef; ::rtl::OUString m_sPurpose; }; |