From 1ef4577e77a4ffccc28464ef6509151f014b882e Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Mon, 19 Jun 2006 22:39:10 +0000
Subject: INTEGRATION: CWS warnings01 (1.1.1.1.270); FILE MERGED 2005/09/22
18:07:49 sb 1.1.1.1.270.2: RESYNC: (1.1.1.1-1.2); FILE MERGED 2005/09/09
12:37:23 sb 1.1.1.1.270.1: #i53898# Made code warning-free.
---
bridges/inc/bridges/remote/proxy.hxx | 42 +++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 12 deletions(-)
(limited to 'bridges/inc')
diff --git a/bridges/inc/bridges/remote/proxy.hxx b/bridges/inc/bridges/remote/proxy.hxx
index 0181a0075cb6..3b71ccfd4893 100644
--- a/bridges/inc/bridges/remote/proxy.hxx
+++ b/bridges/inc/bridges/remote/proxy.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: proxy.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 22:12:55 $
+ * last change: $Author: hr $ $Date: 2006-06-19 23:39:10 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -42,7 +42,26 @@
namespace bridges_remote {
-void SAL_CALL remote_release( void * );
+extern "C" typedef void SAL_CALL FreeRemote2UnoProxy(
+ uno_ExtEnvironment * environment, void * proxy);
+FreeRemote2UnoProxy freeRemote2UnoProxy;
+
+// private:
+extern "C" typedef void SAL_CALL AcquireRemote2UnoProxy(uno_Interface *);
+AcquireRemote2UnoProxy acquireRemote2UnoProxy;
+
+// private:
+extern "C" typedef void SAL_CALL ReleaseRemote2UnoProxy(uno_Interface *);
+ReleaseRemote2UnoProxy releaseRemote2UnoProxy;
+
+// private:
+extern "C" typedef void SAL_CALL DispatchRemote2UnoProxy(
+ uno_Interface *, typelib_TypeDescription const *, void *, void **,
+ uno_Any **);
+DispatchRemote2UnoProxy dispatchRemote2UnoProxy;
+
+extern "C" void SAL_CALL remote_release( void * );
+
class Remote2UnoProxy :
public uno_Interface
{
@@ -57,15 +76,6 @@ public:
~Remote2UnoProxy();
- static void SAL_CALL thisAcquire( uno_Interface * );
- static void SAL_CALL thisRelease( uno_Interface * );
- static void SAL_CALL thisDispatch( uno_Interface * pUnoI,
- typelib_TypeDescription * pMemberType,
- void * pReturn,
- void * pArgs[],
- uno_Any ** ppException );
- static void SAL_CALL thisFree( uno_ExtEnvironment *pEnvUno, void *pProxy );
-
private:
::rtl::OUString m_sOid;
typelib_InterfaceTypeDescription *m_pType;
@@ -76,6 +86,14 @@ private:
::com::sun::star::uno::Mapping m_mapUno2Remote;
oslInterlockedCount m_nRef;
+
+ friend void SAL_CALL acquireRemote2UnoProxy(uno_Interface *);
+
+ friend void SAL_CALL releaseRemote2UnoProxy(uno_Interface *);
+
+ friend void SAL_CALL dispatchRemote2UnoProxy(
+ uno_Interface *, typelib_TypeDescription const *, void *, void **,
+ uno_Any **);
};
}
--
cgit