diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:38:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:38:14 +0000 |
| commit | f7137523269cffe19bb36c807a07acb18c2f40b3 (patch) | |
| tree | 82eb2658abf2e1749569080036dad28d7b154ae1 /bridges/inc | |
| parent | 5f602cd5018b4fb2bd546a44c42a34c8d7df36e2 (diff) | |
INTEGRATION: CWS warnings01 (1.2.100); FILE MERGED
2005/09/22 18:05:06 sb 1.2.100.2: RESYNC: (1.2-1.3); FILE MERGED
2005/09/09 12:37:19 sb 1.2.100.1: #i53898# Made code warning-free.
Diffstat (limited to 'bridges/inc')
| -rw-r--r-- | bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx index 35862caadbf6..569aa5d12863 100644 --- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx @@ -4,9 +4,9 @@ * * $RCSfile: cppinterfaceproxy.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 22:09:33 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:38:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,6 +51,10 @@ namespace bridges { namespace cpp_uno { namespace shared { class Bridge; +extern "C" typedef void SAL_CALL FreeCppInterfaceProxy( + uno_ExtEnvironment * pEnv, void * pInterface); +FreeCppInterfaceProxy freeCppInterfaceProxy; + /** * A cpp proxy wrapping a uno interface. */ @@ -63,9 +67,6 @@ public: typelib_InterfaceTypeDescription * pTypeDescr, rtl::OUString const & rOId) SAL_THROW(()); - static void SAL_CALL free(uno_ExtEnvironment * pEnv, void * pInterface) - SAL_THROW(()); - // Interface for individual CPP--UNO bridges: Bridge * getBridge() { return pBridge; } @@ -102,6 +103,9 @@ private: rtl::OUString oid; void ** vtables[1]; + + friend void SAL_CALL freeCppInterfaceProxy( + uno_ExtEnvironment * pEnv, void * pInterface); }; } } } |