diff options
| author | Oliver Bolte <obo@openoffice.org> | 2003-09-04 09:54:46 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2003-09-04 09:54:46 +0000 |
| commit | 0de1c4e2a94ab7aa4495763afe6f953f2116bd2c (patch) | |
| tree | 681646de18b2ea9c9a1564808d02e5e465f708b8 /cppuhelper | |
| parent | 1872f67e98c8ea195534449f94e8a1106cbb4999 (diff) | |
INTEGRATION: CWS cliuno01 (1.6.8); FILE MERGED
2003/07/09 10:31:41 dbo 1.6.8.1: #107130# no catch (...)
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/tdmgr.cxx | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index a2841cdbd32d..e43ae1353d8a 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tdmgr.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2003-04-28 16:32:03 $ + * last change: $Author: obo $ $Date: 2003-09-04 10:54:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -624,23 +624,29 @@ static void SAL_CALL typelib_callback( { try { - OUString const & rTypeName = * reinterpret_cast< OUString const * >( &pTypeName ); + OUString const & rTypeName = OUString::unacquired( &pTypeName ); Reference< XTypeDescription > xTD; - if (reinterpret_cast< container::XHierarchicalNameAccess * >( pContext )->getByHierarchicalName( - rTypeName ) >>= xTD) + if (reinterpret_cast< container::XHierarchicalNameAccess * >( + pContext )->getByHierarchicalName( + rTypeName ) >>= xTD) { *ppRet = createCTD( xTD ); } } - catch (...) + catch (Exception & exc) { + OSL_ENSURE( + 0, OUStringToOString( + exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); } } #if OSL_DEBUG_LEVEL > 0 - if (! *ppRet) + if (0 == *ppRet) { - OString aTypeName( OUStringToOString( pTypeName, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### typelib type not accessable: %s\n", aTypeName.getStr() ); + OString msg( + OString("typelibrary type not accessable: ") + + OUStringToOString( pTypeName, RTL_TEXTENCODING_ASCII_US ) ); + OSL_ENSURE( 0, msg.getStr() ); } #endif } |