anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Redo 25580 the right way. (Failure to initialize bparams had caused constant crashes.)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25584 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-07-13 19:34:56 +00:00
parent a692a56f4c
commit a24439b154
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Undo.cpp
View File

@ -73,8 +73,13 @@ struct UndoElement
MathData * ar, BufferParams const & bp,
bool ifb) :
kind(kin), cursor(cur), cell(cel), from(fro), end(en),
pars(pl), array(ar), bparams(bp), isFullBuffer(ifb)
{}
pars(pl), array(ar), bparams(0), isFullBuffer(ifb)
{
if (isFullBuffer)
bparams = new BufferParams(bp);
}
///
~UndoElement() { delete bparams; }
/// Which kind of operation are we recording for?
UndoKind kind;
/// the position of the cursor
@ -90,7 +95,7 @@ struct UndoElement
/// the contents of the saved MathData (for mathed)
MathData * array;
/// Only used in case of full backups
BufferParams bparams;
BufferParams const * bparams;
/// Only used in case of full backups
bool isFullBuffer;
private:
@ -322,8 +327,9 @@ bool Undo::Private::textUndoOrRedo(DocIterator & cur, bool isUndoOperation)
if (undo.isFullBuffer) {
LASSERT(undo.pars, /**/);
// This is a full document
otherstack.top().bparams = buffer_.params();
buffer_.params() = undo.bparams;
delete otherstack.top().bparams;
otherstack.top().bparams = new BufferParams(buffer_.params());
buffer_.params() = *undo.bparams;
swap(buffer_.paragraphs(), *undo.pars);
delete undo.pars;
undo.pars = 0;