diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-11-05 21:07:10 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2016-11-05 22:12:32 +0000 |
| commit | 4ea62fe8a1194bca3bee5048832456c3559dcb8e (patch) | |
| tree | 3299cd657af03ad65a148c5ba9bf22f0fe586285 | |
| parent | 3dc91d3fae79053031cdc9426e1dc13f840a91ba (diff) | |
Replace some OSL_ASSERT (unotools/configmgr)
Change-Id: Ifacee39c43c1171ce673f16a9069e1f72dffae78
Reviewed-on: https://gerrit.libreoffice.org/30596
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 39e93de26d18..c58fbcda72ce 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <osl/diagnose.h> #include <rtl/instance.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> @@ -165,7 +164,7 @@ utl::ConfigManager::acquireTree(utl::ConfigItem & item) { utl::ConfigManager::ConfigManager() {} utl::ConfigManager::~ConfigManager() { - OSL_ASSERT(items_.empty()); + SAL_WARN_IF(!items_.empty(), "unotools.config", "ConfigManager not empty"); } css::uno::Reference< css::container::XHierarchicalNameAccess > @@ -189,7 +188,7 @@ void utl::ConfigManager::removeConfigItem(utl::ConfigItem & item) { } void utl::ConfigManager::registerConfigItem(utl::ConfigItem * item) { - OSL_ASSERT(item != nullptr); + assert(item != nullptr); items_.push_back(item); } |