Index: source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx,v
--- source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	21 Apr 2004 13:40:45 -0000	1.4
+++ source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	24 Apr 2004 07:14:37 -0000
@@ -58,20 +58,9 @@ 
  *
  *
  ************************************************************************/
-#define LEAK_STATIC_DATA
-#define TRACE(x) OSL_TRACE(x)
-#define TRACE(x)
-
-#include <list>
-#include <map>
-#include <typeinfo>
 #include <com/sun/star/uno/genfunc.hxx>
-#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
 #include <typelib/typedescription.hxx>
-#endif
-#ifndef _UNO_DATA_H_
 #include <uno/data.h>
-#endif
 #include "bridges/cpp_uno/shared/bridge.hxx"
 #include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
 #include "bridges/cpp_uno/shared/types.hxx"
@@ -79,8 +68,6 @@ 
 #include "share.hxx"
 
 using namespace com::sun::star::uno;
-using namespace std;
-using namespace rtl;
 
 namespace
 {
@@ -145,8 +132,8 @@ 
 
 	 	if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))  // value
 		{
-			pCppArgs[nPos] = pUnoArgs[nPos] =
-				CPPU_CURRENT_NAMESPACE::adjustPointer( pCppStack, pParamTypeDescr );
+			pCppArgs[nPos] = pCppStack;
+			pUnoArgs[nPos] = pCppStack;
 			switch (pParamTypeDescr->eTypeClass)
 			{
 			case typelib_TypeClass_HYPER:
@@ -286,20 +273,22 @@ 
 	// pCallStack: this, params
 	// eventual [ret*] lies at pCallStack -1
 	// so count down pCallStack by one to keep it simple
-	bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
-		= bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
-		static_cast< char * >(*pCallStack) - nVtableOffset);
 	if ((nFunctionIndex & 0x80000000) != 0) {
 		nFunctionIndex &= 0x7FFFFFFF;
 		--pCallStack;
 	}
+	
+	bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
+		= bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
+		static_cast< char * >(*pCallStack) - nVtableOffset);
+	
   	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
 
 	OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
 				 "### illegal vtable index!" );
 	if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
 	{
-		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
+		throw RuntimeException( rtl::OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
 	}
 
 	// determine called method
@@ -406,7 +395,7 @@ 
 	return eRet;
 }
 
-}
+
 
 //==================================================================================================
 /**
@@ -450,7 +439,6 @@ 
 	return aType;
 }
 //__________________________________________________________________________________________________
-namespace {
 
 int const codeSnippetSize = 56;