diff options
author | Rüdiger Timm <rt@openoffice.org> | 2003-04-23 15:24:33 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-23 15:24:33 +0000 |
commit | 8887123f4b227e1d7e4c9fc678e52b41a9e22347 (patch) | |
tree | 5292d36dd7848785eba2d0feb826bd1abdd87f6e /cppuhelper | |
parent | d0b952917dfdd447b2a15d928169c8756e9e8b82 (diff) |
INTEGRATION: CWS uno2 (1.16.32); FILE MERGED
2003/04/03 12:26:28 jl 1.16.32.1: #i12929# do not Assert when a component cannot be instantiated
Diffstat (limited to 'cppuhelper')
-rw-r--r-- | cppuhelper/source/factory.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 46a7ad01efcf..14b8e1ab864c 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -2,9 +2,9 @@ * * $RCSfile: factory.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:34:31 $ + * last change: $Author: rt $ $Date: 2003-04-23 16:24:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -805,13 +805,15 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() catch( CannotActivateFactoryException& e) { OString msg( OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US) ); - OSL_ENSURE( !msg.getLength(), msg.getStr() ); + OSL_TRACE(msg.getStr() ); } } } } - catch (InvalidRegistryException &) + catch (InvalidRegistryException & e) { + OString msg( OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US) ); + OSL_TRACE(msg.getStr() ); } return xFactory; |