1 files changed, 2 insertions, 24 deletions
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 94e853cfa5e0..2ccd0025b2c3 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: redlnitr.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: ama $ $Date: 2001-03-08 08:21:32 $
+ *  last change: $Author: ama $ $Date: 2001-03-15 15:54:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,10 +73,7 @@
 class SwTxtNode;
 class SwDoc;
 class SfxItemSet;
-
-#ifndef OLD_ATTR_HANDLING
 class SwAttrHandler;
-#endif
 
 class SwExtend
 {
@@ -98,9 +95,6 @@ public:
         { if( pFnt ) return _Leave( rFnt, nNew ); return sal_False; }
     short Enter( SwFont& rFnt, xub_StrLen nNew );
     xub_StrLen Next( xub_StrLen nNext );
-#ifdef OLD_ATTR_HANDLING
-    void ChangeTxtAttr( SwTxtAttr &rHt, sal_Bool bChg );
-#endif
 };
 
 class SwRedlineItr
@@ -108,9 +102,7 @@ class SwRedlineItr
     SwpHtStart_SAR aHints;
     const SwDoc& rDoc;
     const SwTxtNode& rNd;
-#ifndef OLD_ATTR_HANDLING
     SwAttrHandler& rAttrHandler;
-#endif
     SfxItemSet *pSet;
     SwExtend *pExt;
     ULONG nNdIdx;
@@ -127,32 +119,18 @@ class SwRedlineItr
     void FillHints( MSHORT nAuthor, SwRedlineType eType );
     short _Seek( SwFont& rFnt, xub_StrLen nNew, xub_StrLen nOld );
     xub_StrLen _GetNextRedln( xub_StrLen nNext );
-#ifdef OLD_ATTR_HANDLING
-    void _ChangeTxtAttr( SwFont* pFnt, SwTxtAttr &rHt, sal_Bool bChg );
-#endif
     inline short EnterExtend( SwFont& rFnt, xub_StrLen nNew )
         { if( pExt ) return pExt->Enter( rFnt, nNew ); return 0; }
     inline xub_StrLen NextExtend( xub_StrLen nNext )
         { if( pExt ) return pExt->Next( nNext ); return nNext; }
 public:
-#ifndef OLD_ATTR_HANDLING
     SwRedlineItr( const SwTxtNode& rTxtNd, SwFont& rFnt, SwAttrHandler& rAH,
         xub_StrLen nRedlPos, sal_Bool bShw, const SvUShorts *pArr = 0,
         xub_StrLen nStart = STRING_LEN );
-#else
-    SwRedlineItr( const SwTxtNode& rTxtNd, SwFont& rFnt,
-        xub_StrLen nRedlPos, sal_Bool bShw, const SvUShorts *pArr = 0,
-        xub_StrLen nStart = STRING_LEN );
-#endif
     ~SwRedlineItr();
     inline sal_Bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); }
     inline void Clear( SwFont* pFnt ) { if( bOn ) _Clear( pFnt ); }
-#ifndef OLD_ATTR_HANDLING
     void ChangeTxtAttr( SwFont* pFnt, SwTxtAttr &rHt, sal_Bool bChg );
-#else
-    inline void ChangeTxtAttr( SwFont* pFnt, SwTxtAttr &rHt, sal_Bool bChg )
-        { if( bShow || pExt ) _ChangeTxtAttr( pFnt, rHt, bChg ); }
-#endif
     inline short Seek( SwFont& rFnt, xub_StrLen nNew, xub_StrLen nOld )
         { if( bShow || pExt ) return _Seek( rFnt, nNew, nOld ); return 0; }
     inline void Reset() { if( nAct != nFirst ) nAct = STRING_LEN;