Update to cws_srx644_ooo11beta. It still doesn't build but this commit will help

to track the things down.

There are known problems with weak symbols and exceptions. Some c++ tools
inside the port will fail if you try to compile.

The cpp_uno bridge has been updated to the latest linux version available.
Added 'make update' target to upgrade the source to the latest version.

Approved by:	kris (portmgr)

408 files changed, 9911 insertions, 89505 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk b/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice-1.1-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice-1.1-devel/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice-1.1-devel/files/patch-neon+neon.patch b/editors/openoffice-1.1-devel/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice-1.1-devel/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-1.1-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-1.1-devel/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice-1.1-devel/files/patch-store+util+makefile.mk b/editors/openoffice-1.1-devel/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice-1.1/distinfo
+++ b/editors/openoffice-1.1/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice-1.1/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-1.1/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice-1.1/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-1.1/files/patch-freetype+makefile.mk b/editors/openoffice-1.1/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice-1.1/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice-1.1/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice-1.1/files/patch-nas+nas-1.6.patch b/editors/openoffice-1.1/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice-1.1/files/patch-neon+neon.patch b/editors/openoffice-1.1/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice-1.1/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice-1.1/files/patch-sal+osl+unx+process.c b/editors/openoffice-1.1/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice-1.1/files/patch-sal+osl+unx+system.h b/editors/openoffice-1.1/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice-1.1/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice-1.1/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice-1.1/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.1/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice-1.1/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-1.1/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice-1.1/files/patch-solenv+bin+addsym.awk b/editors/openoffice-1.1/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-1.1/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-1.1/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice-1.1/files/patch-store+util+makefile.mk b/editors/openoffice-1.1/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-2.0-devel/files/patch-freetype+makefile.mk b/editors/openoffice-2.0-devel/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice-2.0-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice-2.0-devel/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice-2.0-devel/files/patch-neon+neon.patch b/editors/openoffice-2.0-devel/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice-2.0-devel/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-2.0-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-2.0-devel/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice-2.0-devel/files/patch-store+util+makefile.mk b/editors/openoffice-2.0-devel/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice-3-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-3-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice-3-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-3-devel/files/patch-freetype+makefile.mk b/editors/openoffice-3-devel/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice-3-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice-3-devel/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice-3-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice-3-devel/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice-3-devel/files/patch-neon+neon.patch b/editors/openoffice-3-devel/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice-3-devel/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice-3-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice-3-devel/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice-3-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice-3-devel/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice-3-devel/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice-3-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice-3-devel/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-3-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-3-devel/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice-3-devel/files/patch-store+util+makefile.mk b/editors/openoffice-3-devel/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice-3/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-3/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice-3/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-3/files/patch-freetype+makefile.mk b/editors/openoffice-3/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice-3/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice-3/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice-3/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice-3/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice-3/files/patch-nas+nas-1.6.patch b/editors/openoffice-3/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice-3/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice-3/files/patch-neon+neon.patch b/editors/openoffice-3/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice-3/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice-3/files/patch-sal+osl+unx+process.c b/editors/openoffice-3/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice-3/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice-3/files/patch-sal+osl+unx+system.h b/editors/openoffice-3/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice-3/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice-3/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice-3/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-3/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice-3/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-3/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice-3/files/patch-solenv+bin+addsym.awk b/editors/openoffice-3/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice-3/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-3/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-3/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice-3/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice-3/files/patch-store+util+makefile.mk b/editors/openoffice-3/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice-3/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice-3/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-3/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice-3/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-devel/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice-devel/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-devel/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-devel/files/patch-freetype+makefile.mk b/editors/openoffice-devel/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice-devel/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice-devel/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice-devel/files/patch-neon+neon.patch b/editors/openoffice-devel/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice-devel/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice-devel/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice-devel/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice-devel/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice-devel/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-devel/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice-devel/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-devel/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice-devel/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice-devel/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice-devel/files/patch-store+util+makefile.mk b/editors/openoffice-devel/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-1.1-devel/files/patch-neon+neon.patch b/editors/openoffice.org-1.1-devel/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-1.1-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-store+util+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-1.1/distinfo
+++ b/editors/openoffice.org-1.1/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-1.1/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-1.1/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-1.1/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-1.1/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-1.1/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-1.1/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-1.1/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-1.1/files/patch-neon+neon.patch b/editors/openoffice.org-1.1/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-1.1/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-1.1/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-1.1/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-1.1/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-1.1/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-1.1/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-1.1/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-1.1/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-1.1/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-1.1/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-1.1/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-1.1/files/patch-store+util+makefile.mk b/editors/openoffice.org-1.1/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-2-RC/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2-RC/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-2-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2-RC/files/patch-freetype+makefile.mk b/editors/openoffice.org-2-RC/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-2-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-2-RC/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-2-RC/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-2-RC/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-2-RC/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-2-RC/files/patch-neon+neon.patch b/editors/openoffice.org-2-RC/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-2-RC/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-2-RC/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-2-RC/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-2-RC/files/patch-store+util+makefile.mk b/editors/openoffice.org-2-RC/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-2-RC/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-2-RC/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-2-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-2-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-2-devel/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-2-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-2-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-2-devel/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-2-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-2-devel/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-2-devel/files/patch-neon+neon.patch b/editors/openoffice.org-2-devel/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-2-devel/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-2-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-2-devel/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-2-devel/files/patch-store+util+makefile.mk b/editors/openoffice.org-2-devel/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-2-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-neon+neon.patch b/editors/openoffice.org-2.0-devel/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-2.0-devel/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-2.0-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-store+util+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-2.0/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2.0/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-2.0/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-2.0/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2.0/files/patch-freetype+makefile.mk b/editors/openoffice.org-2.0/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-2.0/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2.0/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-2.0/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-2.0/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-2.0/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-2.0/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-2.0/files/patch-neon+neon.patch b/editors/openoffice.org-2.0/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-2.0/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-2.0/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-2.0/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-2.0/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-2.0/files/patch-store+util+makefile.mk b/editors/openoffice.org-2.0/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-2.0/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-2.0/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-2/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-2/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-2/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-2/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2/files/patch-freetype+makefile.mk b/editors/openoffice.org-2/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-2/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-2/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-2/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-2/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-2/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-2/files/patch-neon+neon.patch b/editors/openoffice.org-2/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-2/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-2/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-2/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-2/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-2/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-2/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-2/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-2/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-2/files/patch-store+util+makefile.mk b/editors/openoffice.org-2/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-2/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-2/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-2/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-3-RC/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-3-RC/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-3-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk b/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-3-RC/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-3-RC/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-3-RC/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-3-RC/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-3-RC/files/patch-neon+neon.patch b/editors/openoffice.org-3-RC/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-3-RC/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-3-RC/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-3-RC/files/patch-store+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-3-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-3-devel/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-3-devel/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-3-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-3-devel/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-3-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-3-devel/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-3-devel/files/patch-neon+neon.patch b/editors/openoffice.org-3-devel/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-3-devel/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-3-devel/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-3-devel/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-3-devel/files/patch-store+util+makefile.mk b/editors/openoffice.org-3-devel/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-3/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-3/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-3/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3/files/patch-freetype+makefile.mk b/editors/openoffice.org-3/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-3/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-3/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-3/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-3/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-3/files/patch-neon+neon.patch b/editors/openoffice.org-3/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-3/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-3/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-3/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-3/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-3/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-3/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-3/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-3/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-3/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-3/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-3/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-3/files/patch-store+util+makefile.mk b/editors/openoffice.org-3/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-3/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-3/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-3/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 64c08be99f88..6f740924c399 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openoffice
 PORTVERSION=	644
 CATEGORIES+=	editors
-MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
+		http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -567,4 +568,13 @@ package-rename:
 	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
 .endif
 
+update:
+	@${MAKE} fetch
+	@${MAKE} extract
+	@cd ${WRKSRC}/.. && for dir in *; do \
+	    if [ -d $$dir ]; then \
+		cd $$dir; cvs update -d; cd ..; \
+	    fi \
+	done
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 14a5e5537a4f..ec9d6788f104 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9
+MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1
diff --git a/editors/openoffice.org-vcltesttool/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-vcltesttool/files/patch-berkeleydb+db-3.2.9.patch
deleted file mode 100644
index 5039502f793d..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-berkeleydb+db-3.2.9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Fri Oct 18 22:02:26 2002
-+++ ../berkeleydb/db-3.2.9.patch	Fri Oct 18 22:05:40 2002
-@@ -1,3 +1,13 @@
-+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig	Fri Oct 18 21:46:44 2002
-++++ build/unxsols3.pro/db-3.2.9/dist/configure	Fri Oct 18 21:48:47 2002
-+@@ -1795,6 +1795,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
- *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 19:28:22 2001
- --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp	Mon Jun 11 15:50:55 2001
- ***************
-@@ -43,3 +53,51 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,23 @@
-+ 
-+   netbsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-++      need_version=no
-++    fi
-++    ;;
-++
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-+     fi
-+     ;;
-+ 
-+@@ -2019,6 +2031,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
deleted file mode 100644
index a530c13b277f..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel
+++ /dev/null
@@ -1,1719 +0,0 @@
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Oct 21 23:54:23 2002
-@@ -0,0 +1,614 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
---- /dev/null	Mon Oct 21 23:56:22 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Oct 21 23:54:49 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.11 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
---- /dev/null	Mon Oct 21 23:56:27 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Oct 21 23:55:05 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_linux_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1.1.1 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
---- /dev/null	Mon Oct 21 23:56:34 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Oct 21 23:55:54 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.5 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Oct 21 23:56:37 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Oct 21 23:54:00 2002
-@@ -0,0 +1,463 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.8 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_linux_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_linux_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
deleted file mode 100644
index 95874155c7db..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ /dev/null
@@ -1,1735 +0,0 @@
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
-@@ -0,0 +1,615 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#define LEAK_STATIC_DATA
-+//  #define TRACE(x) OSL_TRACE(x)
-+#define TRACE(x)
-+
-+#include <stdlib.h>
-+#if STLPORT_VERSION<321
-+#include <list.h>
-+#include <map.h>
-+#else
-+#include <list>
-+#include <map>
-+#endif
-+#include <typeinfo>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
-+#endif
-+
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace com::sun::star::uno;
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex,
-+				 "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+public:
-+	struct ClassDataBuffer
-+	{
-+		void*			m_pVTable;
-+
-+		~ClassDataBuffer();
-+	};
-+private:
-+
-+	map< OUString, ClassDataBuffer* >		m_aClassData;
-+	Mutex									m_aMutex;
-+
-+	void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* );
-+public:
-+	const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* );
-+	
-+	MediateClassData() {}
-+	~MediateClassData();
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::ClassDataBuffer::~ClassDataBuffer()
-+{
-+	delete m_pVTable;
-+}
-+
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData()
-+{
-+	TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" );
-+	
-+	// this MUST be the absolute last one which is called!
-+	for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos )
-+	{
-+		// todo
-+//  		delete (*iPos).second;
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType )
-+{
-+	MutexGuard aGuard( m_aMutex );
-+
-+	map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName );
-+	if( element != m_aClassData.end() )
-+		return (*element).second;
-+
-+	ClassDataBuffer* pBuffer = new ClassDataBuffer();
-+	createVTable( pBuffer, pType );
-+	m_aClassData[ pType->aBase.pTypeName ] = pBuffer;
-+	return pBuffer;
-+}
-+
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+
-+	typelib_TypeClass aType =
-+		cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType )
-+{
-+	// get all member functions
-+	list< sal_Bool > aComplexReturn;
-+
-+	for( int n = 0; n < pType->nAllMembers; n++ )
-+	{
-+		typelib_TypeDescription* pMember = NULL;
-+		TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] );
-+		if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef );
-+			// get method
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			// set method
-+			if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly )
-+				aComplexReturn.push_back( sal_False );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		else
-+		{
-+			typelib_TypeDescription * pRetTD = 0;
-+			TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef );
-+			aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) );
-+			TYPELIB_DANGER_RELEASE( pRetTD );
-+		}
-+		TYPELIB_DANGER_RELEASE( pMember );
-+	}
-+
-+	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
-+	pBuffer->m_pVTable = (void*)pSpace;
-+	
-+	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
-+	void ** pvft	= (void **)pSpace;
-+	pvft[0] = NULL;
-+	pvft[1] = NULL;
-+
-+	// setup vft and code
-+	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
-+	{
-+		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[(nPos << 1) + 2 ] = NULL;
-+		pvft[(nPos << 1) + 3 ] = codeSnip;
-+		
-+		// mov $nPos, %eax
-+		*codeSnip++ = 0xb8;
-+		*(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 );
-+		codeSnip += sizeof(sal_Int32);
-+		aComplexReturn.pop_front();
-+		// mov %esp, %edx
-+		*codeSnip++ = 0x89;
-+		*codeSnip++ = 0xe2;
-+		// jmp  cpp_vtable_call
-+		*codeSnip++ = 0xe9;
-+		*(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32);
-+		codeSnip += sizeof(sal_Int32);
-+	}
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable;
-+}
-+
-+}
-+
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
-+}
-+//##################################################################################################
-+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,365 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include <dlfcn.h>
-+#include <new.h>
-+#include <typeinfo>
-+#if STLPORT_VERSION<321
-+#include <map.h>
-+#else
-+#include <map>
-+#endif
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_
-+#include <typelib/typedescription.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
-+#include <com/sun/star/uno/Any.hxx>
-+#endif
-+
-+#include <rtl/strbuf.hxx>
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-+
-+using namespace std;
-+using namespace osl;
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+//==================================================================================================
-+static OString toUNOname( const OString & rRTTIname )
-+{
-+	OString aRet;
-+	
-+	sal_Char* pStr = rRTTIname.getStr();
-+	sal_Char* pOrg = pStr;
-+
-+	// check for namespace
-+	if( *pStr == '_' )
-+		pStr++;
-+	if( *pStr == 'Q' )
-+	{
-+		pStr++;
-+		if( *pStr++ == '_' )
-+		{
-+			while( *pStr++ != '_' )
-+				;
-+		}
-+	}
-+
-+	while( *pStr )
-+	{
-+		int nCharsToCopy = 0;
-+		while( *pStr >= '0' && *pStr <= '9' )
-+			nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0');
-+		if( aRet.getLength() )
-+			aRet += ".";
-+		aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy );
-+		pStr += nCharsToCopy;
-+	}
-+	
-+	return aRet;
-+}
-+//==================================================================================================
-+static OString toRTTIname( const OString & rUNOname )
-+{
-+	if( ! rUNOname.getLength() )
-+		return OString();
-+    
-+	OStringBuffer aRet( 64 );
-+    
-+    sal_Int32 nIndex = 0;
-+    sal_Int32 nToken = 0;
-+	do
-+    {
-+		OString aToken( rUNOname.getToken( 0, '.', nIndex ) );
-+        aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) );
-+		aRet.append( aToken );
-+        ++nToken;
-+	}
-+    while (nIndex >= 0);
-+
-+    OString ret( aRet.makeStringAndClear() );
-+    
-+	if( nToken >= 2 )
-+	{
-+        OStringBuffer buf( 64 );
-+		buf.append( 'Q' );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( OString::valueOf( (sal_Int32)nToken ) );
-+		if( nToken > 9 )
-+            aRet.append( '_' );
-+        buf.append( ret );
-+        ret = buf.makeStringAndClear();
-+	}
-+    
-+    return ret;
-+}
-+
-+ 
-+//##################################################################################################
-+//#### RTTI simulation #############################################################################
-+//##################################################################################################
-+
-+class RTTIHolder
-+{
-+	static std::map< OString, void* > aAllRTTI;
-+public:
-+	static void* getRTTI( const OString& rTypename );
-+	static void* getRTTI_UnoName( const OString& rUnoTypename )
-+		{ return getRTTI( toRTTIname( rUnoTypename ) ); }
-+
-+	static void* insertRTTI( const OString& rTypename );
-+	static void* insertRTTI_UnoName( const OString& rTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ) ); }
-+
-+	// rSuperTypename MUST exist !!!
-+	static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename );
-+	static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename )
-+		{ return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); }
-+
-+	// for complex RTTI
-+	static void* insertRTTI( const OString& rTypename, void* pRTTI );
-+	static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI )
-+		{ return insertRTTI( toRTTIname( rTypename ), pRTTI ); }
-+};
-+
-+std::map< OString, void* > RTTIHolder::aAllRTTI;
-+
-+void* RTTIHolder::getRTTI( const OString& rTypename )
-+{
-+	std::map< OString, void* >::iterator element;
-+
-+	element = aAllRTTI.find( rTypename );
-+	return element != aAllRTTI.end() ? (*element).second : NULL;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating  base RTTI: %s\n", rTypename.getStr() );
-+#endif
-+	void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename )
-+{
-+#ifdef DEBUG
-+	fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() );
-+#endif
-+	OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" );
-+	void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) );
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI )
-+{
-+	aAllRTTI[ rTypename ] = pRTTI;
-+	return pRTTI;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr )
-+{
-+	OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-+	void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName );
-+	if( pRTTI )
-+		return pRTTI;
-+	
-+	if( ! pCompTypeDescr->pBaseTypeDescription )
-+		// this is a base type
-+		return RTTIHolder::insertRTTI_UnoName( aCompTypeName );
-+	if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription )
-+	{
-+		OString aBasename(
-+						  OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US )
-+		);
-+		if( ! RTTIHolder::getRTTI_UnoName( aBasename ) )
-+			RTTIHolder::insertRTTI_UnoName( aBasename );
-+
-+		// this type has only one supertype
-+		return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename );
-+	}
-+	
-+	// create __si_type_info
-+	void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription );
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+#ifdef DEBUG
-+	fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() );
-+#endif
-+	pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ),
-+								*(__user_type_info*)pSuperRTTI );
-+#if 0
-+	__class_type_info::base_info* pBaseInfo = new __class_type_info::base_info;
-+	pBaseInfo->base = (__user_type_info*)pSuperRTTI;
-+	pBaseInfo->offset = 0;
-+	pBaseInfo->is_virtual = 0;
-+	pBaseInfo->access1 = __class_type_info::PUBLIC;
-+
-+	OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) );
-+	pRTTI = new __class_type_info(
-+		strdup( aCompTypeRTTIname.getStr() ),
-+		pBaseInfo,
-+		1
-+		);
-+#endif
-+	return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI );
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+
-+static Mutex s_aMutex;
-+static std::map< void*, typelib_TypeDescription* > aExceptionMap;
-+
-+static void deleteException( void* pExc, int nDummy )
-+{
-+	MutexGuard aGuard( s_aMutex );
-+	std::map< void*, typelib_TypeDescription* >::iterator element =
-+		aExceptionMap.find( pExc );
-+	OSL_ASSERT( element != aExceptionMap.end() );
-+	if( element != aExceptionMap.end() )
-+	{
-+		typelib_TypeDescription* pType = (*element).second;
-+		aExceptionMap.erase( pExc );
-+		uno_destructData( pExc, pType, cpp_release );
-+		typelib_typedescription_release( pType );
-+	}
-+}
-+
-+//__________________________________________________________________________________________________
-+
-+//##################################################################################################
-+//#### exported ####################################################################################
-+//##################################################################################################
-+
-+
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+	// construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType );
-+	
-+	void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor
-+	uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	uno_any_destruct( pUnoExc, 0 );
-+	
-+	// a must be
-+	OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" );
-+
-+	typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr;
-+	void* pRTTI = generateRTTI( pCompTypeDescr );
-+
-+	{
-+	MutexGuard aGuard( s_aMutex );
-+	aExceptionMap[ pCppExc ] = pTypeDescr;
-+	}
-+	
-+	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__sjthrow();
-+}
-+
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
-+{
-+	OUString aName( OStringToOUString(
-+		toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) );
-+	
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+	typelib_typedescription_getByName(
-+		&pExcTypeDescr,
-+		aName.pData );
-+	OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" );
-+	if (pExcTypeDescr)
-+	{
-+		// construct cpp exception any
-+		Any aAny( pInfo->value, pExcTypeDescr ); // const_cast
-+		typelib_typedescription_release( pExcTypeDescr );
-+		// construct uno exception any
-+		typelib_TypeDescription* pAnyDescr = 0;
-+		getCppuType( (const Any *)0 ).getDescription( &pAnyDescr );
-+		uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno );
-+		typelib_typedescription_release( pAnyDescr );
-+	}
-+}
-+
-+}
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
-@@ -0,0 +1,153 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: gcc2_freebsd_intel.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _RTL_STRING_HXX_
-+#include <rtl/string.hxx>
-+#endif
-+#include <typeinfo>
-+
-+typedef struct _uno_Any uno_Any;
-+typedef struct _uno_Mapping uno_Mapping;
-+
-+// private egcs type info structs
-+
-+// type_info for a simple class ( no base classes or an enum )
-+struct __user_type_info : public std::type_info {
-+	__user_type_info (const char *n) : type_info (n) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+// type_info for a class with one public, nonvirtual base class.
-+
-+class __si_type_info : public __user_type_info {
-+	const __user_type_info &base;
-+	
-+public:
-+	__si_type_info (const char *n, const __user_type_info &b)
-+			: __user_type_info (n), base (b) { }
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void *dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+// type_info for a general class.
-+
-+typedef unsigned int USItype    __attribute__ ((mode (SI)));
-+
-+struct __class_type_info : public __user_type_info {
-+	enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 };
-+	
-+	struct base_info {
-+		const __user_type_info *base;
-+		USItype offset: 29;
-+		bool is_virtual: 1;
-+		access access1: 2;
-+	};
-+	
-+	const base_info *base_list;
-+	size_t n_bases;
-+	
-+	__class_type_info (const char *name, const base_info *bl, size_t bn)
-+			: __user_type_info (name), base_list (bl), n_bases (bn) {}
-+	
-+	//	 dynamic cast. built by gcc
-+	virtual void* dcast (const type_info &, int, void *,
-+						 const type_info * = 0, void * = 0) const;
-+};
-+
-+struct cp_eh_info
-+{
-+	struct __eh_info 
-+	{
-+		void* match_function;
-+		short language;
-+		short version;
-+	};
-+	__eh_info eh_info;
-+	void *value;
-+	void *type;
-+	void (*cleanup)(void *, int);
-+	bool caught;
-+	cp_eh_info *next;
-+	long handlers;
-+	void *original_value;
-+};
-+
-+extern "C" {
-+	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __sjthrow(void) __attribute__ ((__noreturn__));
-+}
-+
-+//##################################################################################################
-+//#### exceptions ##################################################################################
-+//##################################################################################################
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+	
-+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno );
-+
-+} 
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
-@@ -0,0 +1,109 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc2_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
-+
-+CFLAGSNOOPT=-O0
-+NOOPTFILES=$(SLO)$/uno2cpp.obj
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB= i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB) \
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
---- /dev/null	Thu Jan  1 01:00:00 1970
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
-@@ -0,0 +1,473 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdlib.h>
-+#ifndef _RTL_ALLOC_H_
-+#include <rtl/alloc.h>
-+#endif
-+
-+#ifndef _UNO_DATA_H_
-+#include <uno/data.h>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-+#include <bridges/cpp_uno/bridge.hxx>
-+#endif
-+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_
-+#include <bridges/cpp_uno/type_misc.hxx>
-+#endif
-+
-+#include "gcc2_freebsd_intel.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+static void callVirtualMethod( void * pThis,
-+									  sal_Int32 nVtableIndex,
-+									  void * pRegisterReturn,
-+									  typelib_TypeClass eReturnType,
-+									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs,
-+									  sal_Int32 nThisOffset )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) &&
-+				 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+
-+	volatile long edx = 0, eax = 0; // for register returns
-+	__asm__ (
-+		// copy values
-+		"pushl %%edx\n\t"
-+		"pushl %%ecx\n\t"
-+		"pushl %%eax\n\t"
-+		"mov  %0, %%eax\n\t"
-+		"mov  %%eax, %%edx\n\t"
-+		"dec  %%edx\n\t"
-+		"shl  $2, %%edx\n\t"
-+		"add  %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"mov  0(%%edx), %%ecx\n\t"
-+		"sub  $4, %%edx\n\t"
-+		"push %%ecx\n\t"
-+		"dec  %%eax\n\t"
-+		"jne  Lcopy\n"
-+		"Lcall:\n\t"
-+		// do the actual call
-+		"mov  %2, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
-+		"mov  %3, %%eax\n\t"
-+		"add  $1, %%eax\n\t" // first entry is reserved
-+		"shl  $3, %%eax\n\t"
-+		"add  %%eax, %%edx\n\t"
-+		"mov %4, %%eax\n\t"
-+		"movswl (%%edx), %%ecx\n\t"
-+                "add  %%esp, %%eax\n\t"
-+                "add  %%ecx, (%%eax)\n\t"
-+		"mov  4(%%edx), %%edx\n\t"
-+		"call *%%edx\n\t"
-+		// save return registers
-+ 		"mov  %%eax, %5\n\t"
-+ 		"mov  %%edx, %6\n\t"
-+		// cleanup stack
-+ 		"mov  %0, %%eax\n\t"
-+ 		"shl  $2, %%eax\n\t"
-+ 		"add  %%eax, %%esp\n\t"
-+		"popl %%eax\n\t"
-+		"popl %%ecx\n\t"
-+		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-+                    "m"(nThisOffset), "m"(eax), "m"(edx) );
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__ (
-+				"fstps %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__ (
-+				"fstpl %0\n\t"
-+				: : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+
-+        sal_Int32 nThisOffset = 0;
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack  += sizeof(void *);
-+                        nThisOffset = sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
-+			nThisOffset);
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch( ... )
-+ 	{
-+  		// get exception
-+  		cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info();
-+		gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index 20b13ea25cb2..99b8c566fb61 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -1,1608 +1,102 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
+--- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx	Tue Mar 11 18:14:16 2003
++++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Tue Mar 11 18:15:40 2003
+@@ -253,6 +253,13 @@
+ //==================================================================================================
+ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
+ {
++#if defined DEBUG
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
+     void * pCppExc;
+     type_info * rtti;
+ 
+@@ -262,7 +269,12 @@
+ 	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+     OSL_ASSERT( pTypeDescr );
+     if (! pTypeDescr)
+-        terminate();
 +    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
+     
+ 	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+ 	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+@@ -288,29 +300,59 @@
+     TYPELIB_DANGER_RELEASE( pTypeDescr );
+     OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+     if (! rtti)
+-        terminate();
 +    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
 +    }
-+    else
+     }
+     
+ 	__cxa_throw( pCppExc, rtti, deleteException );
+ }
+ 
+ //==================================================================================================
+-void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+ {
+-    OSL_ENSURE( header, "### no exception header!!!" );
+     if (! header)
+-        terminate();
 +    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
++        return;
 +    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
+     
+ 	typelib_TypeDescription * pExcTypeDescr = 0;
+     OUString unoName( toUNOname( header->exceptionType->name() ) );
+-	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+-    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+-    if (! pExcTypeDescr)
+-        terminate();
+-    
+-    // construct uno exception any
+-    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+-    ::typelib_typedescription_release( pExcTypeDescr );
++#if defined DEBUG
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
 +#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
 +    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if defined _DEBUG
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
 +#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
 +    }
 +    else
 +    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
 +    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
+ }
+ 
+ }
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
new file mode 100644
index 000000000000..4622b7fe21c4
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+jni_uno+jni_uno2java.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_uno2java.cxx.orig	Tue Mar 11 12:35:07 2003
++++ ../bridges/source/jni_uno/jni_uno2java.cxx	Tue Mar 11 12:35:29 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "rtl/ustrbuf.hxx"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk
index 4ef61346feb2..5fb5bd636eb1 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk
@@ -5,10 +5,10 @@
  SHL1VERSIONMAP=gcc3_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
 -#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+SHL1VERSIONMAP=gcc2_freebsd_intel.map
++SHL1VERSIONMAP=gcc2_linux_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 -#SHL1VERSIONMAP=gcc3_freebsd_intel.map
-+SHL1VERSIONMAP=gcc3_freebsd_intel.map
++SHL1VERSIONMAP=gcc3_linux_intel.map
  .ENDIF
  
  # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-vcltesttool/files/patch-freetype+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-freetype+makefile.mk
new file mode 100644
index 000000000000..3e5a8dd19f18
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-freetype+makefile.mk
@@ -0,0 +1,11 @@
+--- ../freetype/makefile.mk.orig	Tue Mar 11 14:13:25 2003
++++ ../freetype/makefile.mk	Tue Mar 11 14:13:27 2003
+@@ -100,7 +100,7 @@
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+ .ELIF "$(OS)"=="FREEBSD"
+-OUT2LIB+=objs$/.libs$/libfreetype.so.7*
++OUT2LIB+=objs$/.libs$/libfreetype.so.9*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+ .ENDIF          # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-vcltesttool/files/patch-gnome+gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..b15dbd1d6faf
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,12 @@
+--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Tue Mar 11 12:43:34 2003
++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	Tue Mar 11 12:43:58 2003
+@@ -62,7 +62,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#if !(defined FREEBSD || defined NETBSD)
+ #include <alloca.h>
++#endif
+ #include <string.h>
+ 
+ /* 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-vcltesttool/files/patch-jni_uno+jni_java2uno.cxx
new file mode 100644
index 000000000000..a9ff9e3fed88
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-jni_uno+jni_java2uno.cxx
@@ -0,0 +1,12 @@
+--- ../bridges/source/jni_uno/jni_java2uno.cxx.orig	Tue Mar 11 12:33:06 2003
++++ ../bridges/source/jni_uno/jni_java2uno.cxx	Tue Mar 11 12:34:03 2003
+@@ -62,7 +62,9 @@
+ #if defined _MSC_VER
+ #include <malloc.h>
+ #else
++#if !defined( FREEBSD)
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include "jni_bridge.h"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.6.patch
new file mode 100644
index 000000000000..b6096654ebaf
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.6.patch
@@ -0,0 +1,301 @@
+--- ../nas/nas-1.6.patch.orig	Tue Mar 11 15:04:35 2003
++++ ../nas/nas-1.6.patch	Tue Mar 11 15:29:52 2003
+@@ -69,3 +69,298 @@
+   number		: NUMBER		{ $$ = $1; }
+   		;
+ 
++--- misc/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include "auctl.h"
++ 
++ char *ProgramName;
++--- misc/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #include <stdlib.h>
++ #endif
++ #include <signal.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #if !defined(SYSV) || defined(WIN32)
++ #include <audio/Aos.h>		/* for string and other os stuff */
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:01:04 2003
++@@ -32,7 +32,7 @@
++ #if !defined(ISC40) && !defined(WIN32)
++ #include <sys/file.h>
++ #endif /* !ISC40 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++--- misc/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 14:56:14 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c	Tue Mar 11 15:01:04 2003
++@@ -37,7 +37,7 @@
++ #define access _access
++ #define R_OK 4
++ #endif /* WIN32 */
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <limits.h>				/* for SHRT_MIN and SHRT_MAX */
++ #ifndef SYSV
++ #include <audio/Aos.h>				/* for string and other os
++--- misc/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 14:56:16 2003
+++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c	Tue Mar 11 15:01:04 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ #include	<audio/audiolib.h>
++ #include	<audio/soundlib.h>
++ 
++--- misc/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 14:56:15 2003
+++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>			/* for string and other os stuff */
++ #include <audio/Afuncs.h> 		/* for bcopy et. al. */
++ #include <audio/audiolib.h>
++--- misc/nas-1.6/lib/audio/8svx.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/8svx.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/8svx.h>
++--- misc/nas-1.6/lib/audio/aiff.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/aiff.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <math.h>
++ #include <audio/aiff.h>
++--- misc/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/fileutil.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #include	<stdio.h>
++ #include	<audio/Aos.h>
++ #include	<audio/fileutil.h>
++-#include	<malloc.h>
+++#include	<stdlib.h>
++ 
++ #if NeedFunctionPrototypes
++ unsigned short FileSwapS (unsigned short us)
++--- misc/nas-1.6/lib/audio/snd.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/snd.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include <stdio.h>
++-#include <malloc.h>
+++#include <stdlib.h>
++ #include <audio/Aos.h>
++ #include <audio/snd.h>
++ #include <audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/sound.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/sound.c	Tue Mar 11 15:01:04 2003
++@@ -29,7 +29,7 @@
++ #define _SOUND_C_
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/audio.h>
++ #include	<audio/sound.h>
++--- misc/nas-1.6/lib/audio/voc.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/voc.c	Tue Mar 11 15:01:04 2003
++@@ -23,7 +23,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/voc.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/lib/audio/wave.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/lib/audio/wave.c	Tue Mar 11 15:01:04 2003
++@@ -27,7 +27,7 @@
++  */
++ 
++ #include	<stdio.h>
++-#include 	<malloc.h>
+++#include 	<stdlib.h>
++ #include	<audio/Aos.h>
++ #include	<audio/wave.h>
++ #include	<audio/fileutil.h>
++--- misc/nas-1.6/server/os/utils.c	Tue Mar 11 14:56:13 2003
+++++ misc/build/nas-1.6/server/os/utils.c	Tue Mar 11 15:01:04 2003
++@@ -454,7 +454,7 @@
++ }
++ 
++ #ifdef CAHILL_MALLOC
++-#include <malloc.h>
+++#include <stdlib.h>
++ 
++ void * 
++ debug_Xalloc (char *file, int line, unsigned long amount)
++--- misc/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/audial/audial.c	Tue Mar 11 15:20:51 2003
++@@ -84,6 +84,7 @@
++  */
++ static void
++ usleep(usecs)
+++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
++ unsigned int    usecs;
++ {
++     double          s1;
++@@ -150,6 +151,7 @@
++     pause();
++ }
++ 
+++#endif
++ #endif						/* SYSV else not */
++ #endif						/* VMS else not */
++ #endif						/* NEEDUSLEEP */
++--- misc/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c	Tue Mar 11 15:25:21 2003
++@@ -28,7 +28,7 @@
++  */
++ 
++ #ifndef WIN32
++-# ifdef __NetBSD__
+++# if defined(__NetBSD__) || defined(__FreeBSD__)
++ #  include <limits.h>
++ #  define MAXSHORT SHRT_MAX
++ #  define MINSHORT SHRT_MIN
++--- misc/nas-1.6/config/NetAudio.def	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/config/NetAudio.def	Tue Mar 11 15:26:55 2003
++@@ -8,6 +8,6 @@
++ 
++ XCOMM Directory where NAS will look for it's config file(s)
++ #ifndef NasConfigSearchPath
++-#define NasConfigSearchPath /etc/nas/
+++#define NasConfigSearchPath $(PROJECTROOT)/etc/
++ #endif
++ 
++--- misc/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:19:38 2003
+++++ misc/build/nas-1.6/lib/audio/Imakefile	Tue Mar 11 15:26:26 2003
++@@ -36,6 +36,10 @@
++ #endif
++ #endif /* ProjectX < 5 */
++ 
+++#if HasBSD44Sockets
+++    SOCK_DEFINES = -DBSD44SOCKETS
+++#endif
+++
++ #ifndef NormalLibAudio
++ #define NormalLibAudio NormalLibX
++ #endif
++@@ -79,7 +83,7 @@
++      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++ 
++         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
++-   CONN_DEFINES = ConnectionFlags
+++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
++ 
++ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
++           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
++--- misc/nas-1.6/server/Imakefile	Tue Mar 11 15:19:40 2003
+++++ misc/build/nas-1.6/server/Imakefile	Tue Mar 11 15:27:38 2003
++@@ -105,6 +105,9 @@
++ # if defined(LinuxArchitecture)
++     RCMANDIR = $(FILEMANDIR)
++     RCMANSUFFIX = 5nas
+++# elif defined(FreeBSDArchitecture)
+++    RCMANDIR = $(FILEMANDIR)
+++    RCMANSUFFIX = $(FILEMANSUFFIX)
++ # else
++     RCMANDIR = $(MANDIR)
++     RCMANSUFFIX = 5x
++--- misc/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:19:39 2003
+++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c	Tue Mar 11 15:24:32 2003
++@@ -133,7 +133,7 @@
++ 
++ #include <stdio.h>
++ #include <stdlib.h>
++-#ifndef SVR4
+++#if !defined(SVR4) && !defined(__FreeBSD__)
++ #include <getopt.h>
++ #endif
++ #include <sys/types.h>
++@@ -171,16 +171,11 @@
++ #include <sys/param.h>
++ #include <assert.h>
++ 
++-#ifdef __FreeBSD__
++-# include <machine/soundcard.h>
++-# include <machine/pcaudioio.h>
+++#ifdef __NetBSD__
+++# include <sys/ioctl.h>
+++# include <soundcard.h>
++ #else
++-# ifdef __NetBSD__
++-#  include <sys/ioctl.h>
++-#  include <soundcard.h>
++-# else
++-#  include <sys/soundcard.h>
++-# endif
+++# include <sys/soundcard.h>
++ #endif
++ 
++ #include <audio/audio.h>
++@@ -659,7 +654,11 @@
++     if(sndStatOut.fd == -1)
++     {
++        while ((sndStatOut.fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++				    sndStatOut.howToOpen|extramode,
+++#else
++ 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+++#endif
++ 				    0666)) == -1 && wait)
++        {
++            osLogMsg("openDevice: waiting on output device\n");
++@@ -1310,6 +1309,11 @@
++ /*
++  * Setup soundcard at maximum audio quality.
++  */
+++
+++#if defined(__FreeBSD__)
+++#define NO_16_BIT_SAMPLING
+++#endif
+++
++ static void setupSoundcard(sndStatPtr)
++ SndStat* sndStatPtr;
++ {
++@@ -1472,7 +1476,11 @@
++ 		   sndStatOut.device, sndStatOut.howToOpen);
++ 	
++ 	if ((fd = open(sndStatOut.device, 
+++#if defined(__FreeBSD__)
+++		       sndStatOut.howToOpen|extramode, 0)) == -1)
+++#else
++ 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+++#endif
++ 	  {
++ 	    UNIDENTMSG;
++ 	    return AuFalse;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-neon+neon.patch b/editors/openoffice.org-vcltesttool/files/patch-neon+neon.patch
deleted file mode 100644
index 124207a5470c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-neon+neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../neon/neon.patch.orig	Wed Oct 30 12:37:23 2002
-+++ ../neon/neon.patch	Wed Oct 30 12:53:25 2002
-@@ -208,7 +208,7 @@
- ! 
- ! # --- Files --------------------------------------------------------
- ! 
--! CFLAGS+=-I$(SOLARINCDIR)$/external$/expat
-+! CFLAGS+=-I$(SOLARINCDIR)$/expat
- ! 
- ! CDEFS+=-DHAVE_CONFIG_H
- ! 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+process.c
new file mode 100644
index 000000000000..50023576bec4
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+process.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
++++ ../sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
+@@ -222,7 +222,7 @@
+ 	/* Memory layout of CMD_ARG_PRG:
+        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
+ 
+-#if !defined(NETBSD)
++#if !defined(NETBSD) && !defined(FREEBSD)
+ 	extern sal_Char*  CMD_ARG_PRG;
+ #endif
+ 	extern sal_Char** CMD_ARG_ENV;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+system.h
index d75cac79f29e..c4e255952fc7 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+system.h
@@ -1,6 +1,20 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,12 +216,9 @@
+--- ../sal/osl/unx/system.h.orig	Wed Jun  5 16:24:19 2002
++++ ../sal/osl/unx/system.h	Sun Jan 12 15:48:03 2003
+@@ -205,6 +205,13 @@
+ #   include <sys/ioctl.h>
+ #   include <sys/time.h>
+ #   include <sys/uio.h>
++#   include <sys/exec.h>
++#   include <vm/vm.h>
++#   include <vm/vm_param.h>
++#   include <vm/pmap.h>
++#   include <vm/swap_pager.h>
++#   include <machine/vmparam.h>
++#   include <machine/pmap.h>
+ #	include <sys/un.h>
+ #   include <netinet/tcp.h>
+ #	define 	IORESOURCE_TRANSFER_BSD 
+@@ -216,12 +223,13 @@
  #   elif BYTE_ORDER == PDP_ENDIAN
  #   	define _PDP_ENDIAN
  #   endif
@@ -10,8 +24,12 @@
 -#	define  NO_PTHREAD_PRIORITY
 -#	define  CMD_ARG_PRG					__progname		
 -#	define  CMD_ARG_ENV					environ
-+#	define  CMD_ARG_PROC_STREAM
-+#	define  CMD_ARG_PROC_NAME			"/proc/%u/cmdline"
++/* __progname isn't sufficient here. We need the full path as well 
++ * for e.g. setup and __progname only points to the binary name. 
++ */
++#	define  CMD_ARG_PRG_IS_DEFINED
++#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
++#	define  CMD_ARG_ENV			environ
  #endif
  
  #ifdef SCO
diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+loader.c
index a71f7b3f327c..396c586ee3a3 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+loader.c
@@ -1,17 +1,30 @@
---- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
-+++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
-@@ -615,6 +615,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Oct 31 21:46:52 2002
++++ ../setup2/mow/source/loader/loader.c	Wed Jan 22 14:56:44 2003
+@@ -85,6 +85,12 @@
+ # include <sys/statvfs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#if (OSVERSION < 500000)
++#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n')
++#endif
++#endif
++
+ #include "bitmap"
+ #include "logo.xpm"
+ 
+@@ -650,6 +656,14 @@
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
-+"  FreeBSD)\n" \
+ "  Linux)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
-+"  NetBSD)\n" \
++"  FreeBSD)\n" \
 +"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
 +"    export LD_LIBRARY_PATH\n" \
 +"    ;;\n" \
- "      *)\n" \
++"  NetBSD)\n" \
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-vcltesttool/files/patch-solenv+bin+addsym.awk
new file mode 100644
index 000000000000..996e282b350b
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-solenv+bin+addsym.awk
@@ -0,0 +1,16 @@
+--- ../solenv/bin/addsym.awk.orig	Tue Mar 11 15:11:44 2003
++++ ../solenv/bin/addsym.awk	Tue Mar 11 15:13:19 2003
+@@ -72,11 +72,11 @@
+ END {
+     if (state == 0) {
+         print "# Weak RTTI symbols for C++ exceptions:"
+-        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
++        print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
+     }
+ }
+ state == 2 {
+-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
++    print "        _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
+     state = 3
+ }
+ /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice.org-vcltesttool/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-soltools+checkdll+makefile.mk
new file mode 100644
index 000000000000..e6407402258a
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-soltools+checkdll+makefile.mk
@@ -0,0 +1,12 @@
+--- ../soltools/checkdll/makefile.mk.orig	Tue Mar 11 14:21:02 2003
++++ ../soltools/checkdll/makefile.mk	Tue Mar 11 14:21:30 2003
+@@ -80,7 +80,9 @@
+ APP1TARGET	= 	checkdll
+ APP1OBJS	=	$(OBJ)$/checkdll.obj
+ DEPOBJFILES	=	$(APP1OBJS) 
++.IF "$(OS)"!="FREEBSD"
+ STDLIB += -ldl
++.ENDIF
+ .IF "$(OS)"=="NETBSD"
+ APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+ .ENDIF
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch
deleted file mode 100644
index 2a34de03f4b1..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
-+++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
-@@ -174,3 +174,110 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
-++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
-+@@ -5,8 +5,8 @@
-+ #
-+ # compiler
-+ #
-+-CC = gcc -pthread
-+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-+ 
-+ #
-+ # Basename for libraries
-+@@ -19,7 +19,7 @@
-+ #
-+ LINK=ar cr
-+ # 2.95 flag
-+-DYN_LINK=c++ -pthread -fexceptions -shared -o
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-+ 
-+ OBJEXT=o
-+ DYNEXT=so
-+@@ -41,8 +41,8 @@
-+ 
-+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+ 
-+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-+ 
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- /dev/null	Tue May 28 22:55:00 2002
-++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
-+@@ -0,0 +1,59 @@
-++#
-++# Note : this makefile is for gcc-3 !
-++#
-++
-++#
-++# compiler
-++#
-++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-++
-++#
-++# Basename for libraries
-++#
-++LIB_BASENAME = libstlport_gcc
-++
-++#
-++# guts for common stuff
-++#
-++#
-++LINK=ar cr
-++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
-++
-++OBJEXT=o
-++DYNEXT=so
-++STEXT=a
-++RM=rm -rf
-++PATH_SEP=/
-++MKDIR=mkdir -p
-++COMP=GCC-FREEBSD
-++INSTALL_STEP = install_unix 
-++
-++all:  all_dynamic all_static symbolic_links 
-++
-++include common_macros.mak
-++
-++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-++
-++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-++
-++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-++
-++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-++
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++
-++include common_percent_rules.mak
-++include common_rules.mak
-++
-++
-++#install: all
-++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-++
-++#%.s: %.cpp
-++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-++
-++
-+--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
-++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
-+@@ -21,6 +21,9 @@
-+ #  include <stl/_prolog.h>
-+ # endif
-+ 
-++#ifdef __FreeBSD__
-++# include <../wchar.h>
-++#endif
-+ # include <stl/_cwchar.h>
-+ 
-+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-store+util+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-store+util+makefile.mk
new file mode 100644
index 000000000000..6bef6e960f2e
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-store+util+makefile.mk
@@ -0,0 +1,14 @@
+--- ../store/util/makefile.mk.orig	Tue Mar 11 14:58:53 2003
++++ ../store/util/makefile.mk	Tue Mar 11 14:59:34 2003
+@@ -102,7 +102,11 @@
+ 
+ # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+= 	-lsupc++
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-sysui+oounix+office+gnome+makefile.mk
new file mode 100644
index 000000000000..3d7c2e22aa63
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-sysui+oounix+office+gnome+makefile.mk
@@ -0,0 +1,12 @@
+--- ../sysui/oounix/office/gnome/makefile.mk.orig	Tue Mar 11 16:53:53 2003
++++ ../sysui/oounix/office/gnome/makefile.mk	Tue Mar 11 16:55:28 2003
+@@ -84,7 +84,9 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ APP1LIBS=
++.IF "$(OS)"!="FREEBSD"
+ APP1STDLIBS=-ldl
++.ENDIF
+ 
+ GNOMEFILES= \
+ 	locales.tab
diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
new file mode 100644
index 000000000000..41defbd5eb59
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx
@@ -0,0 +1,11 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig	Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx	Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+ 
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+ 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
index 76deaa66077c..fefc925db41f 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk
@@ -1,13 +1,15 @@
---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 18:28:59 2003
-+++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Wed Mar  5 19:23:22 2003
-@@ -78,6 +78,10 @@
+--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig	Thu Feb 20 17:28:59 2003
++++ ../vcl/unx/source/gdi/getstyle/makefile.mk	Tue Mar 11 16:43:43 2003
+@@ -78,6 +78,12 @@
  GETSTYLE_GNOME=getstyle-gnome-linux-intel
  HASGNOME2=TRUE
  .ENDIF
++.IF "$_(HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +GETSTYLE_GNOME=getstyle-gnome-freebsd-intel
 +HASGNOME2=TRUE
 +.ENDIF
++.ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
  GETSTYLE_GNOME=getstyle-gnome-solaris-sparc
  HASGNOME2=TRUE
diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
index 9cfdc1b27978..984313fc540a 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
@@ -1,16 +1,19 @@
---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 18:29:08 2003
-+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Wed Mar  5 19:25:00 2003
-@@ -75,8 +75,12 @@
+--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig	Thu Feb 20 17:29:08 2003
++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk	Tue Mar 11 16:39:29 2003
+@@ -75,9 +75,15 @@
  
  HASGNOME2=
  
 -.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI"
 +.IF "$(OS)$(CPU)"=="LINUXI"
  MSGBOX_GNOME=msgbox-gnome-linux-intel
-+HASGNOME2=TRUE
+ HASGNOME2=TRUE
 +.ENDIF
++.IF "$(_HAS_GNOME2)"=="TRUE"
 +.IF "$(OS)$(CPU)"=="FREEBSDI"
 +MSGBOX_GNOME=msgbox-gnome-freebsd-intel
- HASGNOME2=TRUE
++HASGNOME2=TRUE
++.ENDIF
  .ENDIF
  .IF "$(OS)$(CPU)"=="SOLARISS"
+ MSGBOX_GNOME=msgbox-gnome-solaris-sparc