INTEGRATION: CWS ooo20040225 (1.3.2); FILE MERGED

2004/02/15 20:33:10 fa 1.3.2.2: Fix up some typos.
2004/02/15 19:37:24 khendricks 1.3.2.1: fix a typo in the MacOSX bridge code "I" should have been an "("

1 files changed, 6 insertions, 6 deletions

diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
index 54bcbd73a058..e4a2a94714b1 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cpp2uno.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2004-02-03 12:42:53 $
+ *  last change: $Author: hr $ $Date: 2004-03-09 12:11:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -363,7 +363,7 @@ static typelib_TypeClass cpp_mediate(
         pThis = gpreg[0];
         }
 
-        pThis = static_cast< char * >IpThis) - nVtableOffset;
+        pThis = static_cast< char * >(pThis) - nVtableOffset;
         bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
     = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(pThis);
 
@@ -497,7 +497,7 @@ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpreg
         sal_Bool bComplex = nFunctionIndex & 0x80000000 ? sal_True : sal_False;
 
     typelib_TypeClass aType =
-             cpp_mediate( nFunctionIndex, nVtabelOffset, (void**)gpreg, (void**)fpreg, ovrflw, (sal_Int64*)nRegReturn );
+             cpp_mediate( nFunctionIndex, nVtableOffset, (void**)gpreg, (void**)fpreg, ovrflw, (sal_Int64*)nRegReturn );
 
         // FIXME: why are we restoring the volatile ctr register here
         // FIXME: and why are we putting back the values for r4, r5, and r6 as well
@@ -581,8 +581,8 @@ void flush_range(unsigned char * addr1, int size)
 
 int const codeSnippetSize = 136;
 
-unsigned char * void codeSnippet( unsigned char * code, sal_Int32 functionIndex,
-                  sal_Int32 vtableOffset, sal, bool simpleRetType )
+unsigned char * codeSnippet( unsigned char * code, sal_Int32 functionIndex,
+                  sal_Int32 vtableOffset, bool simpleRetType )
 {
     if (! simpleRetType )
         functionIndex |= 0x80000000;