INTEGRATION: CWS ooo20040329 (1.2.90); FILE MERGED

2004/03/18 11:25:01 sparcmoz 1.2.90.1: #i24507# linux sparc new code for multi-inherit bridges
This commit is contained in:
Sander Vesik 2004-04-21 12:41:00 +00:00
parent 4534b4d603
commit 4a0e88a136

View file

@ -2,9 +2,9 @@
*
* $RCSfile: except.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: hr $ $Date: 2003-04-28 16:28:48 $
* last change: $Author: svesik $ $Date: 2004-04-21 13:41:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -58,7 +58,6 @@
*
*
************************************************************************/
#include <stdio.h>
#include <dlfcn.h>
#include <cxxabi.h>
@ -69,7 +68,7 @@
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
#include <bridges/cpp_uno/bridge.hxx>
#include <com/sun/star/uno/genfunc.hxx>
#include <typelib/typedescription.hxx>
#include <uno/any2.h>