#include "debug.h"
#include "support/LAssert.h"
+#include "iterators.h"
+
+//#define DELETE_UNUSED_PARAGRAPHS 1
+#ifdef DELETE_UNUSED_PARAGRAPHS
+#include <vector>
+#endif
+
/// the flag used by FinishUndo();
bool undo_finished;
/// a flag
// replace the paragraphs with the undo informations
Paragraph * tmppar3 = undo->par;
- undo->par = 0; // otherwise the undo destructor would
- // delete the paragraph
+ undo->par = 0; /* otherwise the undo destructor would
+ delete the paragraph */
- // get last undo par
+ // get last undo par and set the right(new) inset-owner of the
+ // paragraph if there is any. This is not needed if we don't have
+ // a paragraph before because then in is automatically done in the
+ // function which assigns the first paragraph to an InsetText. (Jug)
Paragraph * tmppar4 = tmppar3;
if (tmppar4) {
- while (tmppar4->next())
+ Inset * in = 0;
+ if (before)
+ in = before->inInset();
+ tmppar4->setInsetOwner(in);
+ while (tmppar4->next()) {
tmppar4 = tmppar4->next();
- }
+ tmppar4->setInsetOwner(in);
+ }
+ }
// now remove the old text if there is any
+#ifdef DELETE_UNUSED_PARAGRAPHS
+ std::vector<Paragraph *> vvpar;
+#endif
if (before != behind || (!behind && !before)) {
if (before)
tmppar5 = before->next();
tmppar5 = firstUndoParagraph(bv, undo->number_of_inset_id);
tmppar2 = tmppar3;
while (tmppar5 && tmppar5 != behind) {
+#ifdef DELETE_UNUSED_PARAGRAPHS
+ vvpar.push_back(tmppar5);
+#endif
tmppar = tmppar5;
tmppar5 = tmppar5->next();
// a memory optimization for edit:
// the text informations.
if (undo->kind == Undo::EDIT) {
tmppar2->setContentsFromPar(tmppar);
+#ifndef DELETE_UNUSED_PARAGRAPHS
tmppar->clearContents();
+#endif
tmppar2 = tmppar2->next();
}
}
tmppar3->previous(before);
} else {
// Do we really enter here ??? (Jug)
- if (!before)
+ if (!before && behind) {
bv->text->ownerParagraph(behind);
+ tmppar3 = behind;
+ }
}
if (tmppar4) {
tmppar4->next(behind);
// calculate the endpar for redoing the paragraphs.
if (behind)
endpar = behind->next();
-
+
tmppar = bv->buffer()->getParFromID(undo->number_of_cursor_par);
- UpdatableInset* it = static_cast<UpdatableInset*>(tmppar3->inInset());
+ UpdatableInset* it = 0;
+ if (tmppar3)
+ it = static_cast<UpdatableInset*>(tmppar3->inInset());
if (it) {
- it->getLyXText(bv)->redoParagraphs(bv, it->getLyXText(bv)->cursor,
+ it->getLyXText(bv)->redoParagraphs(bv,
+ it->getLyXText(bv)->cursor,
endpar);
LyXFont font;
it->update(bv, font, false);
- // we now would have to rebreak the whole paragraph the undo-par
- // was in. How we do it here is not really true. We would have to
- // save this information in the undo-struct and then we could do
- // the right rebreak. Here we only handle the case where this
- // was in the actual paragraph, which not always is true.
+ // we now would have to rebreak the whole paragraph the
+ // undo-par was in. How we do it here is not really true.
+ // We would have to save this information in the undo-struct
+ // and then we could do the right rebreak. Here we only
+ // handle the case where this was in the actual paragraph,
+ // which not always is true.
bv->text->redoParagraphs(bv, bv->text->cursor,
- bv->text->cursor.par());
+ bv->text->cursor.par());
if (tmppar){
it = static_cast<UpdatableInset*>(tmppar->inInset());
- it->edit(bv);
- it->getLyXText(bv)->setCursorIntern(bv, tmppar, undo->cursor_pos);
- it->getLyXText(bv)->updateCounters(bv, it->getLyXText(bv)->cursor.row());
+ LyXText * t;
+ if (it) {
+ it->edit(bv);
+ t = it->getLyXText(bv);
+ } else {
+ t = bv->text;
+ }
+ t->setCursorIntern(bv, tmppar, undo->cursor_pos);
+ t->updateCounters(bv, t->cursor.row());
}
bv->text->setCursorIntern(bv, bv->text->cursor.par(),
- bv->text->cursor.pos());
+ bv->text->cursor.pos());
} else {
bv->text->redoParagraphs(bv, bv->text->cursor, endpar);
if (tmppar) {
LyXText * t;
Inset * it = tmppar->inInset();
- if (it)
+ if (it) {
+ it->edit(bv);
t = it->getLyXText(bv);
- else
+ } else {
t = bv->text;
+ }
t->setCursorIntern(bv, tmppar, undo->cursor_pos);
t->updateCounters(bv, t->cursor.row());
}
}
result = true;
delete undo;
+#ifdef DELETE_UNUSED_PARAGRAPHS
+ // And here it's save enough to delete all removed paragraphs
+ std::vector<Paragraph *>::iterator pit = vvpar.begin();
+ if (pit != vvpar.end()) {
+ lyxerr << "DEL: ";
+ for(;pit != vvpar.end(); ++pit) {
+ lyxerr << *pit << " ";
+ delete (*pit);
+ }
+ lyxerr << endl << "PARS:";
+ ParIterator end = bv->buffer()->par_iterator_end();
+ ParIterator it = bv->buffer()->par_iterator_begin();
+ for (; it != end; ++it)
+ lyxerr << *it << " ";
+ lyxerr << endl;
+ }
+#endif
}
finishUndo();
bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
while (tmppar != end && tmppar->next()) {
tmppar = tmppar->next();
+#if 0
tmppar2->next(new Paragraph(*tmppar, true));
+#else
+ Paragraph * ptmp = new Paragraph(*tmppar, true);
+ tmppar2->next(ptmp);
+#endif
// a memory optimization: Just store the layout
// information when only edit
if (kind == Undo::EDIT) {
tmppar2->clearContents();
}
tmppar2->next()->previous(tmppar2);
+
tmppar2 = tmppar2->next();
}
tmppar2->next(0);
projects / lyx.git / blobdiff