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

[Noel Grandin (via logerrit)]

 sw/source/filter/html/htmlgrin.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 696d5c865c75c0a16f7367a9f9103684d764f75c
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Oct 9 20:16:44 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Oct 10 17:58:45 2022 +0200

    re-arrange logic to avoid touch SwPosition::nContent
    
    part of the process of hiding the internals of SwPosition
    
    Change-Id: I43c994c5c3bcfd6e45bb14b90cd19ba4d9cddada
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141145
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index c29a9ae8e1ca..492319a598bb 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1515,11 +1515,11 @@ void SwHTMLParser::StripTrailingPara()
                     break;
             }
 
-            m_pPam->GetPoint()->nContent.Assign( nullptr, 0 );
+            SwNode& rDelNode = m_pPam->GetPoint()->GetNode();
+            m_pPam->Move( fnMoveBackward, GoInNode );
             m_pPam->SetMark();
             m_pPam->DeleteMark();
-            m_xDoc->GetNodes().Delete( m_pPam->GetPoint()->GetNode() );
-            m_pPam->Move( fnMoveBackward, GoInNode );
+            m_xDoc->GetNodes().Delete( rDelNode );
         }
         else if (pCNd && pCNd->IsTextNode() && m_xTable)
         {