X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FUndo.cpp;h=20c76462e3b3324b5ab5e914df53e09ff1c89fcf;hb=8524ee93c35ed3ca15a0aaafa7b893f2f7d21f47;hp=3d0f2ed093554af5ac27652216e05d2237039ef3;hpb=42123ab8a71080b6d15fca4e0c43ae76abf00a1e;p=lyx.git

diff --git a/src/Undo.cpp b/src/Undo.cpp
index 3d0f2ed093..20c76462e3 100644
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -21,12 +21,12 @@
 #include "Cursor.h"
 #include "debug.h"
 #include "BufferView.h"
-#include "LyXText.h"
+#include "Text.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
 
 #include "mathed/MathSupport.h"
-#include "mathed/MathArray.h"
+#include "mathed/MathData.h"
 
 #include "insets/Inset.h"
 
@@ -101,12 +101,12 @@ void doRecordUndo(Undo::undo_kind kind,
 	// fill in the real data to be saved
 	if (cell.inMathed()) {
 		// simply use the whole cell
-		undo.array = new MathArray(cell.cell());
+		undo.array = new MathData(cell.cell());
 	} else {
 		// some more effort needed here as 'the whole cell' of the
-		// main LyXText _is_ the whole document.
+		// main Text _is_ the whole document.
 		// record the relevant paragraphs
-		LyXText const * text = cell.text();
+		Text const * text = cell.text();
 		BOOST_ASSERT(text);
 		ParagraphList const & plist = text->paragraphs();
 		ParagraphList::const_iterator first = plist.begin();
@@ -164,6 +164,7 @@ bool textUndoOrRedo(BufferView & bv,
 
 	// This does the actual undo/redo.
 	//lyxerr << "undo, performing: " << undo << std::endl;
+	bool labelsUpdateNeeded = false;
 	DocIterator dit = undo.cell.asDocIterator(&buf->inset());
 	if (undo.isFullBuffer) {
 		BOOST_ASSERT(undo.pars);
@@ -184,7 +185,7 @@ bool textUndoOrRedo(BufferView & bv,
 		undo.array = 0;
 	} else {
 		// Some finer machinery is needed here.
-		LyXText * text = dit.text();
+		Text * text = dit.text();
 		BOOST_ASSERT(text);
 		BOOST_ASSERT(undo.pars);
 		ParagraphList & plist = text->paragraphs();
@@ -209,7 +210,7 @@ bool textUndoOrRedo(BufferView & bv,
 		plist.insert(first, undo.pars->begin(), undo.pars->end());
 		delete undo.pars;
 		undo.pars = 0;
-		updateLabels(*buf);
+		labelsUpdateNeeded = true;
 	}
 	BOOST_ASSERT(undo.pars == 0);
 	BOOST_ASSERT(undo.array == 0);
@@ -220,8 +221,10 @@ bool textUndoOrRedo(BufferView & bv,
 	cur.selection() = false;
 	cur.resetAnchor();
 	cur.fixIfBroken();
+	
+	if (labelsUpdateNeeded)
+		updateLabels(*buf);
 	finishUndo();
-
 	return true;
 }