summaryrefslogtreecommitdiff
path: root/bridges/source/cpp_uno/gcc3_linux_sparc
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:44:05 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:44:05 +0000
commit759b43d3622cd9708941b6c9506029040bc94193 (patch)
tree152fbe4f0330cd8a0282bfe022cde419b45ac33c /bridges/source/cpp_uno/gcc3_linux_sparc
parent68bd2285573ec5142445f6055fedd5f9c553dc25 (diff)
INTEGRATION: CWS warnings01 (1.6.40); FILE MERGED
2005/09/22 18:19:29 sb 1.6.40.2: RESYNC: (1.6-1.7); FILE MERGED 2005/09/09 12:37:35 sb 1.6.40.1: #i53898# Made code warning-free.
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_sparc')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx14
1 files changed, 8 insertions, 6 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
index d8322f652609..d5f31e8f4d02 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 22:25:59 $
+ * last change: $Author: hr $ $Date: 2006-06-19 23:44:05 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -468,11 +468,13 @@ 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 )
{
#if defined BRIDGES_DEBUG
OString cstr( OUStringToOString( pMemberDescr->pTypeName, RTL_TEXTENCODING_ASCII_US ) );
@@ -595,4 +597,4 @@ void * pReturn, void * pArgs[], uno_Any ** ppException ) SAL_THROW(())
}
}
-}
+} } }