INTEGRATION: CWS writercorehandoff (1.13.448); FILE MERGED

2006/03/17 08:00:40 tra 1.13.448.9: RESYNC: (1.15-1.16); FILE MERGED
2006/01/19 08:49:55 fme 1.13.448.8: #i50348# General cleanup - removed unused header files, functions, members, declarations
2005/10/25 08:24:54 tra 1.13.448.7: RESYNC: (1.14-1.15); FILE MERGED
2005/10/24 16:01:11 tra 1.13.448.6: #50348#
2005/09/28 13:59:47 tra 1.13.448.5: #i50348#
2005/09/13 13:10:33 tra 1.13.448.4: RESYNC: (1.13-1.14); FILE MERGED
2005/08/31 12:50:43 tra 1.13.448.3: #i50348# Introducing IDocumentRedlineAccess interface
2005/06/07 14:13:16 fme 1.13.448.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:26:55 tra 1.13.448.1: Unnecessary includes removed #i50348#

1 files changed, 11 insertions, 15 deletions

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index e19ebec81e73..94d2529158dc 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: crstrvl.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: rt $ $Date: 2006-03-09 14:04:18 $
+ *  last change: $Author: hr $ $Date: 2006-08-14 15:51:31 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,7 +33,6 @@
  *
  ************************************************************************/
 
-
 #pragma hdrstop
 
 #ifndef _HINTIDS_HXX
@@ -80,9 +79,6 @@
 #ifndef _FLDBAS_HXX
 #include <fldbas.hxx>
 #endif
-#ifndef _HINTS_HXX
-#include <hints.hxx>        // SwTxtFld
-#endif
 #ifndef _SWTABLE_HXX
 #include <swtable.hxx>      // SwTxtFld
 #endif
@@ -1325,7 +1321,7 @@ FASTBOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                 if( !bRet && SwContentAtPos::SW_REDLINE & rCntntAtPos.eCntntAtPos )
                 {
-                    const SwRedline* pRedl = GetDoc()->GetRedline( aPos );
+                    const SwRedline* pRedl = GetDoc()->GetRedline(aPos, NULL);
                     if( pRedl )
                     {
                         rCntntAtPos.aFnd.pRedl = pRedl;
@@ -1708,7 +1704,7 @@ FASTBOOL SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                 pCNd && pCNd->Len() )
                 nUndoId = 0;
 
-            GetDoc()->StartUndo( nUndoId );
+            GetDoc()->StartUndo( nUndoId, NULL );
 
             SwTxtFmtColl* pNextFmt = 0;
             SwTxtNode* pTNd = pCNd->GetTxtNode();
@@ -1744,7 +1740,7 @@ FASTBOOL SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                 {
                     *pCurCrsr->GetPoint() = aPos;
                     GetDoc()->Insert( *pCurCrsr,
-                            SvxFmtBreakItem( SVX_BREAK_COLUMN_BEFORE ));
+                            SvxFmtBreakItem( SVX_BREAK_COLUMN_BEFORE ), 0);
                 }
             }
 
@@ -1769,7 +1765,7 @@ FASTBOOL SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                     if( SVX_ADJUST_LEFT != rAdj.GetAdjust() )
                         aSet.Put( SvxAdjustItem( SVX_ADJUST_LEFT ) );
 
-                    GetDoc()->Insert( *pCurCrsr, aSet );
+                    GetDoc()->Insert( *pCurCrsr, aSet, 0 );
                 }
                 else
                     ASSERT( !this, "wo ist mein CntntNode?" );
@@ -1788,7 +1784,7 @@ FASTBOOL SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                         sInsert += sSpace;
                     }
                     if( sInsert.Len() )
-                        GetDoc()->Insert( *pCurCrsr, sInsert );
+                        GetDoc()->Insert( *pCurCrsr, sInsert, true );
                 }
                 // kein break - Ausrichtung muss noch gesetzt werden
             case FILL_MARGIN:
@@ -1806,12 +1802,12 @@ FASTBOOL SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                     default:
                         break;
                     }
-                    GetDoc()->Insert( *pCurCrsr, aAdj );
+                    GetDoc()->Insert( *pCurCrsr, aAdj, NULL );
                 }
                 break;
             }
 
-            GetDoc()->EndUndo( nUndoId );
+            GetDoc()->EndUndo( nUndoId, NULL );
             EndAction();
 
             bRet = TRUE;
@@ -1882,7 +1878,7 @@ const SwRedline* SwCrsrShell::_GotoRedline( USHORT nArrPos, BOOL bSelect )
         if( pFnd && bSelect )
         {
             pCurCrsr->SetMark();
-            if( REDLINE_FMTCOLL == pFnd->GetType() )
+            if( IDocumentRedlineAccess::REDLINE_FMTCOLL == pFnd->GetType() )
             {
                 pCNd = pIdx->GetNode().GetCntntNode();
                 pCurCrsr->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
@@ -2039,7 +2035,7 @@ FASTBOOL SwCrsrShell::SelectNxtPrvHyperlink( BOOL bNext )
 {
     SwNodes& rNds = GetDoc()->GetNodes();
     const SwNode* pBodyEndNd = &rNds.GetEndOfContent();
-    const SwNode* pBodySttNd = pBodyEndNd->FindStartNode();
+    const SwNode* pBodySttNd = pBodyEndNd->StartOfSectionNode();
     ULONG nBodySttNdIdx = pBodySttNd->GetIndex();
     Point aPt;