[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-5' - sw/source

[Noel Grandin (via logerrit)]

 sw/source/core/docnode/section.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e7e3ceaae97688aa1894db0d2368237cf32e0346
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 20 16:03:18 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon Jun 24 11:38:20 2019 +0200

    tdf#125983 CRASH: Updating link to external files
    
    Revert "loplugin:useuniqueptr in lcl_UpdateLinksInSect"
    This reverts commit 9abbe6746cb4d36e3ccb384f96ccafb9e0612cd6.
    
    No point in use std::unique_ptr, sometimes pPam points to something
    we want to delete, sometimes it does not.
    
    Change-Id: I37e9871b8d5d836b7e52b5b8a5a7c572d92487f5
    Reviewed-on: https://gerrit.libreoffice.org/74449
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 8729c98bbe6843e875be3903c2e5a7783984ae48)
    Reviewed-on: https://gerrit.libreoffice.org/74485
    (cherry picked from commit fa121a50d23cc4154741059a6916d45cdcbc0c59)
    Reviewed-on: https://gerrit.libreoffice.org/74488
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 5beee8974b0682602ad0bbe12ac1e33f7644958a)
    Reviewed-on: https://gerrit.libreoffice.org/74534
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index b77e0f99859d..a8919d10073e 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1192,7 +1192,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
     bool bWasVisibleLinks = pDoc->getIDocumentLinksAdministration().IsVisibleLinks();
     pDoc->getIDocumentLinksAdministration().SetVisibleLinks( false );
 
-    std::unique_ptr<SwPaM> pPam;
+    SwPaM* pPam;
     SwViewShell* pVSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
     SwEditShell* pESh = pDoc->GetEditShell();
     pDoc->getIDocumentFieldsAccess().LockExpFields();
@@ -1212,7 +1212,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
         --aPos.nNode;
         SwDoc::CorrAbs( aIdx, aEndIdx, aPos, true );
 
-        pPam.reset(new SwPaM( aPos ));
+        pPam = new SwPaM( aPos );
 
         // Delete everything succeeding it
         --aIdx;
@@ -1396,7 +1396,8 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
             pESh->Push();
             SwPaM* pCursor = pESh->GetCursor();
             *pCursor->GetPoint() = *pPam->GetPoint();
-            pPam.reset(pCursor);
+            delete pPam;
+            pPam = pCursor;
         }
 
         SvMemoryStream aStrm( const_cast<sal_Int8 *>(aSeq.getConstArray()), aSeq.getLength(),
@@ -1431,6 +1432,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
         pESh->EndAllAction();
     else if( pVSh )
         pVSh->EndAction();
+    delete pPam; // Was created at the start
 
     return SUCCESS;
 }