diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-01 11:18:00 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-01 11:18:00 +0000 |
| commit | 3b6262109b1db97e9b80f6df01a837e6793c2e87 (patch) | |
| tree | c14af40ec4db8b0d048d91749019273bc639bf80 /bridges/source/cpp_uno/cc50_solaris_sparc | |
| parent | 84f23a3e34b0772beea88643299b3f391db397e3 (diff) | |
INTEGRATION: CWS sb34 (1.15.70); FILE MERGED
2005/06/28 15:23:54 sb 1.15.70.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).
Diffstat (limited to 'bridges/source/cpp_uno/cc50_solaris_sparc')
| -rw-r--r-- | bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx index 8e1154aa8bda..5110d567e8a8 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: uno2cpp.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: obo $ $Date: 2004-06-04 02:59:31 $ + * last change: $Author: kz $ $Date: 2005-07-01 12:18:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -273,26 +273,11 @@ static void cpp_call( catch( ... ) { void* pExc = __Crun::ex_get(); - const char* pName = 0; - 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_sparc_fillUnoException( - pExc, pName, pExcTypeDescr, *ppUnoExc, pThis->getBridge()->getCpp2Uno()); + pExc, pName, *ppUnoExc, pThis->getBridge()->getCpp2Uno()); // temporary params for ( ; nTempIndizes--; ) |