diff options
| -rw-r--r-- | unotools/inc/unotools/configitem.hxx | 5 | ||||
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 17 |
2 files changed, 13 insertions, 9 deletions
diff --git a/unotools/inc/unotools/configitem.hxx b/unotools/inc/unotools/configitem.hxx index d1487c5a6d84..9c8c237a01ed 100644 --- a/unotools/inc/unotools/configitem.hxx +++ b/unotools/inc/unotools/configitem.hxx @@ -2,9 +2,9 @@ * * $RCSfile: configitem.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: fs $ $Date: 2002-08-02 14:51:45 $ + * last change: $Author: os $ $Date: 2002-09-25 07:58:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,6 +96,7 @@ namespace utl #define CONFIG_MODE_DELAYED_UPDATE 0x01 #define CONFIG_MODE_ALL_LOCALES 0x02 #define CONFIG_MODE_RELEASE_TREE 0x04 +#define CONFIG_MODE_IGNORE_ERRORS 0x08 //prevent assertions enum ConfigNameFormat { diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 7ca59ecccfd4..afb300f5b8d5 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: configmgr.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: os $ $Date: 2002-09-25 07:51:42 $ + * last change: $Author: os $ $Date: 2002-09-25 07:59:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -289,11 +289,14 @@ Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem& #ifdef DBG_UTIL catch(Exception& rEx) { - OString sMsg("CreateInstance exception: "); - sMsg += OString(rEx.Message.getStr(), - rEx.Message.getLength(), - RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, sMsg.getStr()); + if(0 == (CONFIG_MODE_IGNORE_ERRORS & rCfgItem.GetMode())) + { + OString sMsg("CreateInstance exception: "); + sMsg += OString(rEx.Message.getStr(), + rEx.Message.getLength(), + RTL_TEXTENCODING_ASCII_US); + OSL_ENSURE(sal_False, sMsg.getStr()); + } } #else catch(Exception&) |