1 files changed, 10 insertions, 11 deletions
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index cf364b5e2e1d..441077728afe 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 #include "hintids.hxx"
 #include <svl/whiter.hxx>
 #include <tools/shl.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
 #include <com/sun/star/i18n/ScriptType.hdl>
-#endif
 #include <swmodule.hxx>
 #include <redline.hxx>      // SwRedline
 #include <txtatr.hxx>       // SwTxt ...
@@ -48,9 +47,7 @@
 #include <vcl/cmdevt.hxx>
 #include <vcl/settings.hxx>
 #include <txtfrm.hxx>       // SwTxtFrm
-#ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
-#endif
 #include <redlnitr.hxx>
 #include <extinput.hxx>
 #include <sfx2/printer.hxx>
@@ -103,7 +100,7 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
     aMagicNo[SW_LATIN] = aMagicNo[SW_CJK] = aMagicNo[SW_CTL] = NULL;
 
     // determine script changes if not already done for current paragraph
-    ASSERT( pScriptInfo, "No script info available");
+    OSL_ENSURE( pScriptInfo, "No script info available");
     if ( pScriptInfo->GetInvalidity() != STRING_LEN )
          pScriptInfo->InitScriptInfo( rTxtNode, bRTL );
 
@@ -321,7 +318,7 @@ void SwRedlineItr::FillHints( MSHORT nAuthor, RedlineType_t eType )
 
 void SwRedlineItr::ChangeTxtAttr( SwFont* pFnt, SwTxtAttr &rHt, sal_Bool bChg )
 {
-    ASSERT( IsOn(), "SwRedlineItr::ChangeTxtAttr: Off?" );
+    OSL_ENSURE( IsOn(), "SwRedlineItr::ChangeTxtAttr: Off?" );
 
     if( !bShow && !pExt )
         return;
@@ -335,14 +332,14 @@ void SwRedlineItr::ChangeTxtAttr( SwFont* pFnt, SwTxtAttr &rHt, sal_Bool bChg )
     }
     else
     {
-        ASSERT( ! pExt || ! pExt->IsOn(), "Pop of attribute during opened extension" )
+        OSL_ENSURE( ! pExt || ! pExt->IsOn(), "Pop of attribute during opened extension" );
         rAttrHandler.PopAndChg( rHt, *pFnt );
     }
 }
 
 void SwRedlineItr::_Clear( SwFont* pFnt )
 {
-    ASSERT( bOn, "SwRedlineItr::Clear: Off?" );
+    OSL_ENSURE( bOn, "SwRedlineItr::Clear: Off?" );
     bOn = sal_False;
     while( aHints.Count() )
     {
@@ -448,8 +445,8 @@ void SwExtend::ActualizeFont( SwFont &rFnt, MSHORT nAttr )
 
 short SwExtend::Enter( SwFont& rFnt, xub_StrLen nNew )
 {
-    ASSERT( !Inside(), "SwExtend: Enter without Leave" );
-    ASSERT( !pFnt, "SwExtend: Enter with Font" );
+    OSL_ENSURE( !Inside(), "SwExtend: Enter without Leave" );
+    OSL_ENSURE( !pFnt, "SwExtend: Enter with Font" );
     nPos = nNew;
     if( Inside() )
     {
@@ -462,7 +459,7 @@ short SwExtend::Enter( SwFont& rFnt, xub_StrLen nNew )
 
 sal_Bool SwExtend::_Leave( SwFont& rFnt, xub_StrLen nNew )
 {
-    ASSERT( Inside(), "SwExtend: Leave without Enter" );
+    OSL_ENSURE( Inside(), "SwExtend: Leave without Enter" );
     MSHORT nOldAttr = rArr[ nPos - nStart ];
     nPos = nNew;
     if( Inside() )
@@ -503,3 +500,5 @@ xub_StrLen SwExtend::Next( xub_StrLen nNext )
     }
     return nNext;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */