[Libreoffice-commits] core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/core/undo/unredln.cxx |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 5b8bc6dc6b5b956d2cf3294f78a7ea2d24eaf561
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Sep 5 11:24:43 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Sep 5 13:16:35 2022 +0200

    use more SwPosition::Assign
    
    part of hiding the internals of SwPosition
    
    Change-Id: Ie9cd58e276670875a73521b0f703fda78ae93efa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139408
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 4c8f41ac2345..a8a572a40d4d 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -353,8 +353,7 @@ void SwUndoRedlineSort::UndoRedlineImpl(SwDoc & rDoc, SwPaM 
& rPam)
     }
 
     {
-        SwPaM aTmp( *rPam.GetMark() );
-        aTmp.GetMark()->nContent = 0;
+        SwPaM aTmp( rPam.GetMark()->GetNode() );
         aTmp.SetMark();
         aTmp.GetPoint()->Assign( m_nSaveEndNode, m_nSaveEndContent );
         rDoc.getIDocumentRedlineAccess().DeleteRedline( aTmp, true, 
RedlineType::Any );
@@ -367,9 +366,9 @@ void SwUndoRedlineSort::UndoRedlineImpl(SwDoc & rDoc, SwPaM 
& rPam)
     pPam->GetPoint()->Assign( aPrevIdx.GetNode(), SwNodeOffset(+1) );
     pPam->SetMark();
 
-    pPam->GetPoint()->nNode += nOffsetTemp;
+    pPam->GetPoint()->Adjust(nOffsetTemp);
     SwContentNode* pCNd = pPam->GetPointContentNode();
-    pPam->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
+    pPam->GetPoint()->SetContent( pCNd->Len() );
 
     SetValues( *pPam );
 
@@ -393,12 +392,12 @@ void SwUndoRedlineSort::RedoRedlineImpl(SwDoc & rDoc, 
SwPaM & rPam)
     sal_Int32 nLen = pCNd->Len();
     if( nLen > nCntStt )
         nLen = nCntStt;
-    pPam->GetPoint()->nContent.Assign(pCNd, nLen );
+    pPam->GetPoint()->SetContent( nLen );
     pPam->SetMark();
 
-    pPam->GetPoint()->nNode += nOffsetTemp;
+    pPam->GetPoint()->Adjust(nOffsetTemp);
     pCNd = pPam->GetPointContentNode();
-    pPam->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
+    pPam->GetPoint()->SetContent( pCNd->Len() );
 
     SetValues( rPam );
 
@@ -531,9 +530,7 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & 
rContext)
             if (&rTmp != pEnd)
             {
                 rPam.SetMark();
-                ++rPam.GetPoint()->nNode;
-                rPam.GetBound().nContent.Assign( nullptr, 0 );
-                rPam.GetBound( false ).nContent.Assign( nullptr, 0 );
+                rPam.GetPoint()->Adjust(SwNodeOffset(1));
                 m_pUndoDelete2.reset(new SwUndoDelete(rPam, 
SwDeleteFlags::Default, true));
             }
         }