diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-12-01 12:58:47 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-12-10 14:12:02 +0100 |
| commit | 1ecf9ed3fc33c984890848eacbecad5e009eb33d (patch) | |
| tree | e5c11525b3a57063cc1c4730a86cd9d1806f9a0b | |
| parent | 662e3299c578e2bff8a1cb9884e6266353ea1ebe (diff) | |
do not save UNO marks in undo history
These are usually very short-lived marks that are used for various
internal purposes or by UNO interfaces, so restoring them from undo history
does not make any sense. It can in fact lead to a crash on undo if the mark has
been already deleted (which is usually the case with UNO marks) but
the restoring still refers to it (this is not a problem with other mark types
since those should be deleted only when they are no longer in the document,
in which case they are saved in undo history by content positions rather than
mark references).
Change-Id: Id707dc3d2b888b5c96a974d04a0ef17b22fc024c
| -rw-r--r-- | sw/source/core/undo/undobj.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index e0dd5b727af6..855795d86211 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -767,10 +767,12 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark, if ( bSavePos || bSaveOtherPos ) { - if( !pHistory ) - pHistory = new SwHistory; - - pHistory->Add( *pBkmk, bSavePos, bSaveOtherPos ); + if( IDocumentMarkAccess::GetType(*pBkmk) != IDocumentMarkAccess::UNO_BOOKMARK ) + { + if( !pHistory ) + pHistory = new SwHistory; + pHistory->Add( *pBkmk, bSavePos, bSaveOtherPos ); + } if ( bSavePos && ( bSaveOtherPos || !pBkmk->IsExpanded() ) ) |