summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:44:30 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:44:30 +0000
commit6fe9c2d67c7362822314d7f348b6ce3acc510b00 (patch)
tree1035cc3439f229e01f4dd45cf9667eea85e8bc2b
parent64e5c3e0980dd9c19130ddf9e32d80c7d9bc086c (diff)
INTEGRATION: CWS warnings01 (1.2.40); FILE MERGED
2006/01/25 20:20:31 sb 1.2.40.3: RESYNC: (1.3-1.4); FILE MERGED 2005/09/22 18:24:07 sb 1.2.40.2: RESYNC: (1.2-1.3); FILE MERGED 2005/09/09 12:37:38 sb 1.2.40.1: #i53898# Made code warning-free.
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
index 8749bc343797..9f711e49ea9d 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2006-01-16 13:23:15 $
+ * last change: $Author: hr $ $Date: 2006-06-19 23:44:30 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -307,10 +307,11 @@ static void cpp_call(
}
-//==================================================================================================
-void bridges::cpp_uno::shared::UnoInterfaceProxy::dispatch(
+namespace bridges { namespace cpp_uno { namespace shared {
+
+void unoInterfaceProxyDispatch(
uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
- void * pReturn, void * pArgs[], uno_Any ** ppException ) SAL_THROW(())
+ void * pReturn, void * pArgs[], uno_Any ** ppException )
{
// is my surrogate
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
@@ -427,3 +428,5 @@ void bridges::cpp_uno::shared::UnoInterfaceProxy::dispatch(
}
}
}
+
+} } }