diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-03-25 14:01:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-03-25 14:01:44 +0000 |
| commit | e2a6c3f2722b5d9e0e2b969641308eafcfd0d9f6 (patch) | |
| tree | 560bbea94cd51251015059656db931bb92d181bd /cppuhelper/source/tdmgr.cxx | |
| parent | 8763d914760c41e1e314837e3566a30c7c73c37e (diff) | |
INTEGRATION: CWS jl3 (1.7.16); FILE MERGED
2004/03/15 13:41:47 jl 1.7.16.2: RESYNC: (1.7-1.8); FILE MERGED
2003/12/16 16:45:42 dbo 1.7.16.1: #114506# fixed assertion
Diffstat (limited to 'cppuhelper/source/tdmgr.cxx')
| -rw-r--r-- | cppuhelper/source/tdmgr.cxx | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index 3a29d1b0b149..bd1b0f4d0cda 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tdmgr.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2004-02-03 13:28:45 $ + * last change: $Author: kz $ $Date: 2004-03-25 15:01:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,6 @@ #include <osl/diagnose.h> #include <rtl/alloc.h> #include <rtl/ustring.hxx> -#include <rtl/string.hxx> #include <cppuhelper/implbase1.hxx> #include <typelib/typedescription.h> @@ -649,22 +648,21 @@ static void SAL_CALL typelib_callback( *ppRet = createCTD( xTD ); } } + catch (container::NoSuchElementException & exc) + { + OSL_ENSURE( + 0, OUStringToOString( + OUString( RTL_CONSTASCII_USTRINGPARAM( + "typelibrary type not available: ") ) + + exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + } catch (Exception & exc) { OSL_ENSURE( 0, OUStringToOString( - exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } -#if OSL_DEBUG_LEVEL > 0 - if (0 == *ppRet) - { - OString msg( - OString("typelibrary type not accessable: ") + - OUStringToOString( pTypeName, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( 0, msg.getStr() ); - } -#endif } } } |