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

[Noel Grandin (via logerrit)]

 sw/source/filter/html/swhtml.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 79f049d4d7f071aa87207b53c257b6a0aa15365a
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Sep 20 16:46:43 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Sep 21 10:20:37 2022 +0200

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

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 8a31aa197ec9..0f36092d080f 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2835,13 +2835,12 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool 
bBeforeTable,
                         continue;
                     }
                 }
-                aAttrPam.GetPoint()->nNode = pAttr->m_nStartPara;
 
                 // because of the deleting of BRs the start index can also
                 // point behind the end the text
                 if( pAttr->m_nStartContent > pCNd->Len() )
                     pAttr->m_nStartContent = pCNd->Len();
-                aAttrPam.GetPoint()->nContent.Assign( pCNd, 
pAttr->m_nStartContent );
+                aAttrPam.GetPoint()->Assign( *pCNd, pAttr->m_nStartContent );
 
                 aAttrPam.SetMark();
                 if ( (pAttr->GetStartParagraph() != pAttr->GetEndParagraph()) 
&&
@@ -2862,8 +2861,6 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool 
bBeforeTable,
                             continue;
                         }
                     }
-
-                    aAttrPam.GetPoint()->nNode = pAttr->m_nEndPara;
                 }
                 else if( pAttr->IsLikePara() )
                 {
@@ -2875,7 +2872,7 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool 
bBeforeTable,
                 if( pAttr->m_nEndContent > pCNd->Len() )
                     pAttr->m_nEndContent = pCNd->Len();
 
-                aAttrPam.GetPoint()->nContent.Assign( pCNd, 
pAttr->m_nEndContent );
+                aAttrPam.GetPoint()->Assign( *pCNd, pAttr->m_nEndContent );
                 if( bBeforeTable &&
                     aAttrPam.GetPoint()->GetNodeIndex() ==
                         rEndIdx.GetIndex() )
@@ -3030,8 +3027,7 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool 
bBeforeTable,
         {
             pFrameFormat->DelFrames();
             *aAttrPam.GetPoint() = *pFlyPos;
-            aAttrPam.GetPoint()->nContent.Assign( 
aAttrPam.GetPointContentNode(),
-                                                   m_aMoveFlyCnts[n] );
+            aAttrPam.GetPoint()->SetContent( m_aMoveFlyCnts[n] );
             SwFormatAnchor aAnchor( rAnchor );
             aAnchor.SetType( RndStdIds::FLY_AT_CHAR );
             aAnchor.SetAnchor( aAttrPam.GetPoint() );