REPLACE DBG_stuff with OSL_ASSERT and OSL_FAIL

5 files changed, 10 insertions, 10 deletions

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 96c5d74a319e..23f4e11f035c 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -118,7 +118,7 @@ class SwNoteProps: public utl::ConfigItem
             const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames = GetPropertyNames();
                 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aValues = GetProperties(rNames);
                 const ::com::sun::star::uno::Any* pValues = aValues.getConstArray();
-               DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed");
+               OSL_ENSURE(aValues.getLength() == rNames.getLength(), "GetProperties failed");
                 if (aValues.getLength())
                 pValues[0]>>=bIsShowAnchor;
         }
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index c11769d08912..8e985856d6b0 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -183,12 +183,12 @@ public:
 // --- inlines -----------------------------------------------------------
 inline const String&    SwAuthEntry::GetAuthorField(ToxAuthorityField ePos)const
 {
-    DBG_ASSERT(AUTH_FIELD_END > ePos, "wrong index");
+    OSL_ENSURE(AUTH_FIELD_END > ePos, "wrong index");
     return aAuthFields[ePos];
 }
 inline void SwAuthEntry::SetAuthorField(ToxAuthorityField ePos, const String& rField)
 {
-    DBG_ASSERT(AUTH_FIELD_END > ePos, "wrong index");
+    OSL_ENSURE(AUTH_FIELD_END > ePos, "wrong index");
     if(AUTH_FIELD_END > ePos)
         aAuthFields[ePos] = rField;
 }
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 236cc46fc1d0..cd95b1c75ed8 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -30,7 +30,7 @@
 #define _BPARR_HXX
 
 #include <tools/solar.h>
-#include <tools/debug.hxx>
+#include <osl/diagnose.h>
 #include <swdllapi.h>
 
 struct BlockInfo;
@@ -113,7 +113,7 @@ public:
 
 inline sal_uLong BigPtrEntry::GetPos() const
 {
-    DBG_ASSERT( this == pBlock->pData[ nOffset ], "element not in the block" );
+    OSL_ENSURE( this == pBlock->pData[ nOffset ], "element not in the block" );
     return pBlock->nStart + nOffset;
 }
 
diff --git a/sw/inc/switerator.hxx b/sw/inc/switerator.hxx
index be729771b54b..fb0523c22fef 100644
--- a/sw/inc/switerator.hxx
+++ b/sw/inc/switerator.hxx
@@ -28,14 +28,14 @@
 #define _SWITERATOR_HXX
 
 #include <calbck.hxx>
-#include <tools/debug.hxx>
+#include <osl/diagnose.h>
 
 template< class TElementType, class TSource > class SwIterator
 {
     SwClientIter aClientIter;
 public:
 
-    SwIterator( const TSource& rSrc ) : aClientIter(rSrc) { DBG_ASSERT( TElementType::IsOf( TYPE(SwClient) ), "Incompatible types!" ); }
+    SwIterator( const TSource& rSrc ) : aClientIter(rSrc) { OSL_ENSURE( TElementType::IsOf( TYPE(SwClient) ), "Incompatible types!" ); }
     TElementType* First()     { SwClient* p = aClientIter.First(TYPE(TElementType)); return PTR_CAST(TElementType,p); }
     TElementType* Last()      { SwClient* p = aClientIter.Last( TYPE(TElementType)); return PTR_CAST(TElementType,p); }
     TElementType* Next()      { SwClient* p = aClientIter.Next();     return PTR_CAST(TElementType,p); }
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index f3a381aadb30..1729cb93945d 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -543,12 +543,12 @@ public:
 
     const String&           GetStyleNames(sal_uInt16 nLevel) const
                                 {
-                                DBG_ASSERT( nLevel < MAXLEVEL, "Which level?");
+                                OSL_ENSURE( nLevel < MAXLEVEL, "Which level?");
                                 return aStyleNames[nLevel];
                                 }
     void                    SetStyleNames(const String& rSet, sal_uInt16 nLevel)
                                 {
-                                DBG_ASSERT( nLevel < MAXLEVEL, "Which level?");
+                                OSL_ENSURE( nLevel < MAXLEVEL, "Which level?");
                                 aStyleNames[nLevel] = rSet;
                                 }
     sal_Bool                    IsFromChapter() const { return bFromChapter;}
@@ -760,7 +760,7 @@ inline sal_uInt16 SwTOXBase::GetLevel() const
 
 inline void SwTOXBase::SetTemplateName(const String& rName)
 {
-    DBG_WARNING("SwTOXBase::SetTemplateName obsolete");
+    OSL_FAIL("SwTOXBase::SetTemplateName obsolete");
     aStyleNames[0] = rName;
 }