unotools/source/config/configmgr.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit 4ea62fe8a1194bca3bee5048832456c3559dcb8e Author: Julien Nabet <[email protected]> Date: Sat Nov 5 21:07:10 2016 +0100 Replace some OSL_ASSERT (unotools/configmgr) Change-Id: Ifacee39c43c1171ce673f16a9069e1f72dffae78 Reviewed-on: https://gerrit.libreoffice.org/30596 Reviewed-by: Julien Nabet <[email protected]> Tested-by: Julien Nabet <[email protected]> diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 39e93de..c58fbcd 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); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
