Replaced remaining OSL_ASSERT in configmgr.

4 files changed, 16 insertions, 12 deletions

diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx
index 15d69d6f6fc7..8bf70c218192 100644
--- a/configmgr/source/broadcaster.cxx
+++ b/configmgr/source/broadcaster.cxx
@@ -28,6 +28,8 @@
 
 #include "sal/config.h"
 
+#include <cassert>
+
 #include "com/sun/star/beans/XPropertiesChangeListener.hpp"
 #include "com/sun/star/beans/XPropertyChangeListener.hpp"
 #include "com/sun/star/container/XContainerListener.hpp"
@@ -40,7 +42,6 @@
 #include "com/sun/star/uno/XInterface.hpp"
 #include "com/sun/star/util/XChangesListener.hpp"
 #include "cppuhelper/exc_hlp.hxx"
-#include "osl/diagnose.hxx"
 #include "rtl/string.h"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.h"
@@ -217,7 +218,7 @@ Broadcaster::DisposeNotification::DisposeNotification(
     css::lang::EventObject const & theEvent):
     listener(theListener), event(theEvent)
 {
-    OSL_ASSERT(theListener.is());
+    assert(theListener.is());
 }
 
 Broadcaster::ContainerNotification::ContainerNotification(
@@ -226,7 +227,7 @@ Broadcaster::ContainerNotification::ContainerNotification(
     css::container::ContainerEvent const & theEvent):
     listener(theListener), event(theEvent)
 {
-    OSL_ASSERT(theListener.is());
+    assert(theListener.is());
 }
 
 Broadcaster::PropertyChangeNotification::PropertyChangeNotification(
@@ -235,7 +236,7 @@ Broadcaster::PropertyChangeNotification::PropertyChangeNotification(
     css::beans::PropertyChangeEvent const & theEvent):
     listener(theListener), event(theEvent)
 {
-    OSL_ASSERT(theListener.is());
+    assert(theListener.is());
 }
 
 Broadcaster::PropertiesChangeNotification::PropertiesChangeNotification(
@@ -244,7 +245,7 @@ Broadcaster::PropertiesChangeNotification::PropertiesChangeNotification(
     css::uno::Sequence< css::beans::PropertyChangeEvent > const & theEvent):
     listener(theListener), event(theEvent)
 {
-    OSL_ASSERT(theListener.is());
+    assert(theListener.is());
 }
 
 Broadcaster::ChangesNotification::ChangesNotification(
@@ -252,7 +253,7 @@ Broadcaster::ChangesNotification::ChangesNotification(
     css::util::ChangesEvent const & theEvent):
     listener(theListener), event(theEvent)
 {
-    OSL_ASSERT(theListener.is());
+    assert(theListener.is());
 }
 
 }
diff --git a/configmgr/source/modifications.cxx b/configmgr/source/modifications.cxx
index 4aabd301836d..f8d3a4411f2d 100644
--- a/configmgr/source/modifications.cxx
+++ b/configmgr/source/modifications.cxx
@@ -28,6 +28,8 @@
 
 #include "sal/config.h"
 
+#include <cassert>
+
 #include "rtl/ustring.hxx"
 
 #include "modifications.hxx"
@@ -60,7 +62,7 @@ void Modifications::add(Path const & path) {
 }
 
 void Modifications::remove(Path const & path) {
-    OSL_ASSERT(!path.empty());
+    assert(!path.empty());
     Node * p = &root_;
     for (Path::const_iterator i(path.begin());;) {
         Node::Children::iterator j(p->children.find(*i));
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 5022c07d579e..fb17066d73dd 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -28,6 +28,7 @@
 
 #include "sal/config.h"
 
+#include <cassert>
 #include <set>
 
 #include "boost/noncopyable.hpp"
@@ -75,7 +76,7 @@ public:
     Service(css::uno::Reference< css::uno::XComponentContext > const context):
         context_(context)
     {
-        OSL_ASSERT(context.is());
+        assert(context.is());
         lock_ = lock();
     }
 
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index 7dfb36da8ee8..84c12bd8fa1c 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -28,12 +28,12 @@
 
 #include "sal/config.h"
 
+#include <cassert>
 #include <climits>
 
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
-#include "osl/diagnose.hxx"
 #include "rtl/string.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
@@ -69,7 +69,7 @@ bool XcdParser::startElement(
     xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
 {
     if (nestedParser_.is()) {
-        OSL_ASSERT(nesting_ != LONG_MAX);
+        assert(nesting_ != LONG_MAX);
         ++nesting_;
         return nestedParser_->startElement(reader, nsId, name);
     }
@@ -145,7 +145,7 @@ bool XcdParser::startElement(
         }
         break;
     default: // STATE_DEPENDENCY
-        OSL_ASSERT(false); // this cannot happen
+        assert(false); // this cannot happen
         break;
     }
     throw css::uno::RuntimeException(
@@ -170,7 +170,7 @@ void XcdParser::endElement(xmlreader::XmlReader const & reader) {
         case STATE_COMPONENTS:
             break;
         default:
-            OSL_ASSERT(false); // this cannot happen
+            assert(false); // this cannot happen
             break;
         }
     }