3 files changed, 68 insertions, 11 deletions

diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 44ac5f49c4..72da13fe5a 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -833,7 +833,7 @@ SwHistoryResetAttrSet::SwHistoryResetAttrSet( const SfxItemSet& rSet,
     , m_Array( (BYTE)rSet.Count() )
 {
     SfxItemIter aIter( rSet );
-    bool bAutoStyle = true;
+    bool bAutoStyle = false;
 
     while( TRUE )
     {
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 38a83445c5..9338e5fbc5 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -666,14 +666,9 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
                     {
                         if( !pHistory )
                             pHistory = new SwHistory;
-                        if( pAPos->nNode < pEnd->nNode &&
-                            ( ( nsDelCntntType::DELCNT_CHKNOCNTNT & nDelCntntType ) ||
-                              ( pStt->nNode < pAPos->nNode || !pStt->nContent.GetIndex() ) ) )
+                        if (IsDestroyFrameAnchoredAtChar(
+                                *pAPos, *pStt, *pEnd, nDelCntntType))
                         {
-                            // Here we identified the objects to destroy:
-                            // - anchored between start and end of the selection
-                            // - anchored in start of the selection with "CheckNoContent"
-                            // - anchored in start of sel. and the selection start at pos 0
                             pHistory->Add( *pFmt, nChainInsPos );
                             n = n >= rSpzArr.Count() ? rSpzArr.Count() : n+1;
                         }
@@ -1388,3 +1383,20 @@ String DenoteSpecialCharacters(const String & rStr)
 
     return aResult;
 }
+
+bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos,
+        SwPosition const & rStart, SwPosition const & rEnd,
+        DelCntntType const nDelCntntType)
+{
+
+    // Here we identified the objects to destroy:
+    // - anchored between start and end of the selection
+    // - anchored in start of the selection with "CheckNoContent"
+    // - anchored in start of sel. and the selection start at pos 0
+    return  (rAnchorPos.nNode < rEnd.nNode)
+         && (   (nsDelCntntType::DELCNT_CHKNOCNTNT & nDelCntntType)
+            ||  (rStart.nNode < rAnchorPos.nNode)
+            ||  !rStart.nContent.GetIndex()
+            );
+}
+
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 944e239daf..8ce47d86dc 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -247,6 +247,12 @@ void SwUndoRedlineSort::_Undo( SwUndoIter& rIter )
     // im aSaveRange steht der kopierte, sprich der originale.
     SwDoc& rDoc = rIter.GetDoc();
 
+    SwPosition* pStart = rIter.pAktPam->Start();
+    SwPosition* pEnd   = rIter.pAktPam->End();
+
+    SwNodeIndex aPrevIdx( pStart->nNode, -1 );
+    ULONG nOffsetTemp = pEnd->nNode.GetIndex() - pStart->nNode.GetIndex();
+
     if( 0 == ( nsRedlineMode_t::REDLINE_SHOW_DELETE & rDoc.GetRedlineMode()) )
     {
         // die beiden Redline Objecte suchen und diese dann anzeigen lassen,
@@ -254,17 +260,17 @@ void SwUndoRedlineSort::_Undo( SwUndoIter& rIter )
         // das Geloeschte ist versteckt, also suche das INSERT
         // Redline Object. Dahinter steht das Geloeschte
         USHORT nFnd = rDoc.GetRedlinePos(
-                            *rDoc.GetNodes()[ nSttNode + nOffset + 1 ],
+                            *rDoc.GetNodes()[ nSttNode + 1 ],
                             nsRedlineType_t::REDLINE_INSERT );
         ASSERT( USHRT_MAX != nFnd && nFnd+1 < rDoc.GetRedlineTbl().Count(),
                     "kein Insert Object gefunden" );
         ++nFnd;
-        rDoc.GetRedlineTbl()[nFnd]->Show();
-        SetPaM( *rIter.pAktPam );
+        rDoc.GetRedlineTbl()[nFnd]->Show( 1 );
     }
 
     {
         SwPaM aTmp( *rIter.pAktPam->GetMark() );
+        aTmp.GetMark()->nContent = 0;
         aTmp.SetMark();
         aTmp.GetPoint()->nNode = nSaveEndNode;
         aTmp.GetPoint()->nContent.Assign( aTmp.GetCntntNode(), nSaveEndCntnt );
@@ -272,13 +278,52 @@ void SwUndoRedlineSort::_Undo( SwUndoIter& rIter )
     }
 
     rDoc.DelFullPara( *rIter.pAktPam );
+
+    SwPaM*  pPam = rIter.pAktPam;
+    pPam->DeleteMark();
+    pPam->GetPoint()->nNode.Assign( aPrevIdx.GetNode(), +1 );
+    SwCntntNode* pCNd = pPam->GetCntntNode();
+    pPam->GetPoint()->nContent.Assign(pCNd, 0 );
+    pPam->SetMark();
+
+    pPam->GetPoint()->nNode += nOffsetTemp;
+    pCNd = pPam->GetCntntNode();
+    pPam->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
+
+    SetValues( *pPam );
+
     SetPaM( *rIter.pAktPam );
 }
 
 void SwUndoRedlineSort::_Redo( SwUndoIter& rIter )
 {
     SwPaM& rPam = *rIter.pAktPam;
+
+    SwPaM* pPam = &rPam;
+    SwPosition* pStart = pPam->Start();
+    SwPosition* pEnd   = pPam->End();
+
+    SwNodeIndex aPrevIdx( pStart->nNode, -1 );
+    ULONG nOffsetTemp = pEnd->nNode.GetIndex() - pStart->nNode.GetIndex();
+    xub_StrLen nCntStt	= pStart->nContent.GetIndex();
+
     rIter.GetDoc().SortText( rPam, *pOpt );
+
+    pPam->DeleteMark();
+    pPam->GetPoint()->nNode.Assign( aPrevIdx.GetNode(), +1 );
+    SwCntntNode* pCNd = pPam->GetCntntNode();
+    xub_StrLen nLen = pCNd->Len();
+    if( nLen > nCntStt )
+        nLen = nCntStt;
+    pPam->GetPoint()->nContent.Assign(pCNd, nLen );
+    pPam->SetMark();
+
+    pPam->GetPoint()->nNode += nOffsetTemp;
+    pCNd = pPam->GetCntntNode();
+    pPam->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
+
+    SetValues( rPam );
+
     SetPaM( rPam );
     rPam.GetPoint()->nNode = nSaveEndNode;
     rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), nSaveEndCntnt );