3 files changed, 5 insertions, 8 deletions
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 362f93b4f42a..a8830a6587c3 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -596,7 +596,7 @@ sal_uLong SvTreeList::GetVisiblePos( const SvListView* pView, SvTreeListEntry* p
 
 sal_uLong SvTreeList::GetVisibleCount( SvListView* pView ) const
 {
-    DBG_ASSERT(pView,"GetVisCount:No View");
+    assert(pView && "GetVisCount:No View");
     if( !pView->HasViewData() )
         return 0;
     if ( pView->nVisibleCount )
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 5d0eadfe7627..2f6bc55d6b95 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -3813,22 +3813,19 @@ void SvTreeListBox::ExcecuteContextMenuAction( sal_uInt16 )
 
 void SvTreeListBox::EnableContextMenuHandling( void )
 {
-    DBG_ASSERT( pImp, "-SvTreeListBox::EnableContextMenuHandling(): No implementation!" );
-
+    assert(pImp && "-SvTreeListBox::EnableContextMenuHandling(): No implementation!");
     pImp->bContextMenuHandling = true;
 }
 
 void SvTreeListBox::EnableContextMenuHandling( bool b )
 {
-    DBG_ASSERT( pImp, "-SvTreeListBox::EnableContextMenuHandling(): No implementation!" );
-
+    assert(pImp && "-SvTreeListBox::EnableContextMenuHandling(): No implementation!");
     pImp->bContextMenuHandling = b;
 }
 
 bool SvTreeListBox::IsContextMenuHandlingEnabled( void ) const
 {
-    DBG_ASSERT( pImp, "-SvTreeListBox::IsContextMenuHandlingEnabled(): No implementation!" );
-
+    assert(pImp && "-SvTreeListBox::IsContextMenuHandlingEnabled(): No implementation!");
     return pImp->bContextMenuHandling;
 }
 
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 627ea8f87f6d..a448ff70a52a 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -53,7 +53,7 @@ SvBaseEventDescriptor::SvBaseEventDescriptor( const SvEventDescription* pSupport
         mpSupportedMacroItems(pSupportedMacroItems),
         mnMacroItems(0)
 {
-    DBG_ASSERT(pSupportedMacroItems != NULL, "Need a list of supported events!");
+    assert(pSupportedMacroItems != NULL && "Need a list of supported events!");
 
     for( ; mpSupportedMacroItems[mnMacroItems].mnEvent != 0; mnMacroItems++) ;
 }