diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-01 11:16:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-01 11:16:12 +0000 |
| commit | 3f163dada88fce61106f4247f8f664b01ab83c6a (patch) | |
| tree | b0222e3cc5c6ef0bae8b0a29d6bb14f4ce607835 | |
| parent | 9f042fedcdbd573718177736b8b95552537fc206 (diff) | |
INTEGRATION: CWS sb34 (1.11.28); FILE MERGED
2005/06/28 15:23:47 sb 1.11.28.1: #b6280765# Adapted Solaris C++--UNO bridge code to be compliant with libCrun (problems with ex_alloc/ex_throw usage, and pointers within RTTI structures).
| -rw-r--r-- | bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx index b39b2042278a..55ccbff3de46 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: uno2cpp.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2005-02-21 12:12:49 $ + * last change: $Author: kz $ $Date: 2005-07-01 12:16:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -287,26 +287,11 @@ static inline void cpp_call( catch( ... ) { void* pExc = __Crun::ex_get(); - const char* pName; - typelib_TypeDescription * pExcTypeDescr = 0; - - // test for magic code set in cc50_solaris_sparc_raiseException() - if( ((void**)pExc)[-1] != (void*)0xbadfad ) - { - pName = __Cimpl::ex_name(); - } - else - { - // in case of an exception thrown in - // cc50_solaris_sparc_raiseException(), - // the typedescription has not been released yet, but will be - // by deleteException(). - pExcTypeDescr = (typelib_TypeDescription *)((void**)pExc)[-2]; - } + const char* pName = __Cimpl::ex_name(); // get exception CPPU_CURRENT_NAMESPACE::cc50_solaris_intel_fillUnoException( - pExc, pName, pExcTypeDescr, *ppUnoExc, + pExc, pName, *ppUnoExc, pThis->getBridge()->getCpp2Uno()); // temporary params |