summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:43:53 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:43:53 +0000
commit68bd2285573ec5142445f6055fedd5f9c553dc25 (patch)
tree0db39fbd670df6b2600afb0cd18854660b315579 /bridges
parent78ab97b78714ef1fe76c1322aa714d716a29514e (diff)
INTEGRATION: CWS warnings01 (1.5.100); FILE MERGED
2005/09/22 18:17:03 sb 1.5.100.2: RESYNC: (1.5-1.6); FILE MERGED 2005/09/09 12:37:33 sb 1.5.100.1: #i53898# Made code warning-free.
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index 3be0935066b7..da2a936f266d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 22:23:33 $
+ * last change: $Author: hr $ $Date: 2006-06-19 23:43:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -511,11 +511,11 @@ static void cpp_call(
}
+namespace bridges { namespace cpp_uno { namespace shared {
-//==================================================================================================
-void bridges::cpp_uno::shared::UnoInterfaceProxy::dispatch(
+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
@@ -636,3 +636,4 @@ void bridges::cpp_uno::shared::UnoInterfaceProxy::dispatch(
}
}
+} } }