diff options
author | Eike Rathke <erack@redhat.com> | 2017-02-17 23:54:21 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-23 12:24:14 +0000 |
commit | 4ecdb497d540e69590476919f4cb1d02a8025c2e (patch) | |
tree | a1eaed839985c8dd2b3acb09d53ae5e550c473fc | |
parent | a7377b9c3df9a2c964d1832d9636d1410f49a29c (diff) |
Resolves: tdf#105667 forget target area's caption pointer in Merge Undo
It's the same that was copied to the Undo document, so don't delete the
caption.
Change-Id: Ib89870ed6e392c4271de2f416c78d42135922609
(cherry picked from commit a627c44026fcf883918f84bddd1c3b745e1f898c)
Reviewed-on: https://gerrit.libreoffice.org/34384
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sc/source/ui/undo/undoblk3.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 7d1f2d97eb82..56a2b41e8f0d 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -701,7 +701,13 @@ void ScUndoMerge::DoChange( bool bUndo ) const // undo -> copy back deleted contents if (bUndo && mpUndoDoc) { - rDoc.DeleteAreaTab( aRange, InsertDeleteFlags::CONTENTS|InsertDeleteFlags::NOCAPTIONS ); + // If there are note captions to be deleted during Undo they were + // kept or moved during the merge and copied to the Undo document + // without cloning the caption. Forget the target area's caption + // pointer that is identical to the one in the Undo document + // instead of deleting it. + rDoc.DeleteAreaTab( aRange, + InsertDeleteFlags::CONTENTS | InsertDeleteFlags::NOCAPTIONS | InsertDeleteFlags::FORGETCAPTIONS ); mpUndoDoc->CopyToDocument(aRange, InsertDeleteFlags::ALL|InsertDeleteFlags::NOCAPTIONS, false, rDoc); } |