[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/source

[Kohei Yoshida]

 sc/source/filter/xcl97/XclExpChangeTrack.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0bb67e725d2e323bd6a9fa71e0094c21eb019c80
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Jul 17 15:52:52 2014 -0400

    fdo#81470: Fix a crasher during xlsx export with revisions.
    
    Calling Undo() here removes revision entries which also removes formula
    cell instances stored in the entries.  The problem is that the
    XclExpChTrCellContent instances store pointers to these formula instances
    for later use, and removing the entries at this location causes deleted
    formula instances to get accessed which in turn causes segfault.
    
    Since all revision entries get deleted when the temp change track instance
    gets deleted at the end of the revision export, not deleting the entries
    here will not cause memory leaks.
    
    Change-Id: I85f8064945a841b684e4fc4a97c3f9bb6a2de353
    (cherry picked from commit 3bce16799c34d0b28704c43eae77501c0f6aec1e)

diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 9682964..3a3655d 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1454,7 +1454,6 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
     {
         PushActionRecord( *pScAction );
         const ScChangeAction* pPrevAction = pScAction->GetPrev();
-        pTempChangeTrack->Undo( pScAction->GetActionNumber(), pScAction->GetActionNumber() );
         pScAction = pPrevAction;
     }