#include "insets/insettext.h"
#include "debug.h"
#include "support/LAssert.h"
-
#include "iterators.h"
#include <vector>
* we are so it will return the first paragraph of the buffer or the
* first paragraph of the textinset we're in.
*/
-Paragraph * firstUndoParagraph(BufferView * bv, int inset_id)
+ParagraphList undoParagraphs(BufferView * bv, int inset_id)
{
Inset * inset = bv->buffer()->getInsetFromID(inset_id);
if (inset) {
- Paragraph * result = inset->getFirstParagraph(0);
- if (result)
- return result;
+ ParagraphList * result = inset->getParagraphs(0);
+ if (result && !result->empty())
+ return *result;
}
- return &*bv->text->ownerParagraphs().begin();
+ return bv->text->ownerParagraphs();
}
num = -1;
}
}
- t->setCursorIntern(firstUndoParagraph(bv, num), 0);
+ t->setCursorIntern(undoParagraphs(bv, num).begin(), 0);
}
- // Replace the paragraphs with the undo informations.
-
- Paragraph * undopar = undo.pars.empty() ? 0 : undo.pars[0];
- // Otherwise the undo destructor would
- // delete the paragraph.
- undo.pars.resize(0);
-
- // 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 * lastundopar = undopar;
- if (lastundopar) {
+ // Set the right(new) inset-owner of the paragraph if there is any.
+ if (!undo.pars.empty()) {
Inset * in = 0;
if (before)
in = before->inInset();
else if (undo.number_of_inset_id >= 0)
in = bv->buffer()->getInsetFromID(undo.number_of_inset_id);
- lastundopar->setInsetOwner(in);
- while (lastundopar->next()) {
- lastundopar = lastundopar->next();
- lastundopar->setInsetOwner(in);
- }
+ for (size_t i = 0, n = undo.pars.size(); i < n; ++i)
+ undo.pars[i]->setInsetOwner(in);
}
+ // Replace the paragraphs with the undo informations.
vector<Paragraph *> deletelist;
// Now add old paragraphs to be deleted.
if (before)
deletepar = before->next();
else
- deletepar = firstUndoParagraph(bv, undo.number_of_inset_id);
- Paragraph * tmppar2 = undopar;
+ deletepar = &undoParagraphs(bv, undo.number_of_inset_id).front();
+ // this surprisingly fills the undo! (Andre')
+ size_t par = 0;
while (deletepar && deletepar != behind) {
deletelist.push_back(deletepar);
- Paragraph * tmppar = deletepar;
deletepar = deletepar->next();
// A memory optimization for edit:
// is stored in the undo. So restore
// the text informations.
if (undo.kind == Undo::EDIT) {
- tmppar2->setContentsFromPar(*tmppar);
- tmppar2 = tmppar2->next();
+ undo.pars[par]->setContentsFromPar(*deletelist.back());
+ ++par;
}
}
}
// the LyXText works!!!
// Thread the end of the undo onto the par in front if any.
- if (lastundopar) {
- lastundopar->next(behind);
+ if (!undo.pars.empty()) {
+ undo.pars.back()->next(behind);
if (behind)
- behind->previous(lastundopar);
+ behind->previous(undo.pars.back());
}
// Put the new stuff in the list if there is one.
- if (undopar) {
- undopar->previous(before);
+ Paragraph * undopar = undo.pars.empty() ? 0 : undo.pars.front();
+ if (!undo.pars.empty()) {
+ undo.pars.front()->previous(before);
if (before)
before->next(undopar);
else {
- int id = firstUndoParagraph(bv, undo.number_of_inset_id)->id();
+ int id = undoParagraphs(bv, undo.number_of_inset_id).front().id();
Paragraph * op = &*bv->buffer()->getParFromID(id);
if (op && op->inInset()) {
static_cast<InsetText*>(op->inInset())->paragraph(undopar);
// have to substitue the second paragraph with the
// first if the removed one is the first.
if (!before && behind) {
- int id = firstUndoParagraph(bv, undo.number_of_inset_id)->id();
+ int id = undoParagraphs(bv, undo.number_of_inset_id).front().id();
Paragraph * op = &*bv->buffer()->getParFromID(id);
if (op && op->inInset()) {
static_cast<InsetText*>(op->inInset())->paragraph(behind);
} else {
bv->buffer()->paragraphs.set(behind);
}
-
undopar = behind;
}
}
delete (*pit);
}
+ // Otherwise the undo destructor would delete the paragraphs
+ undo.pars.resize(0);
+
finishUndo();
bv->text->postPaint(0);
return true;
ParagraphList::iterator itfirst, ParagraphList::iterator itbehind,
shared_ptr<Undo> & u)
{
- Paragraph * first = &*itfirst;
- Paragraph * behind = &*itbehind;
+ Paragraph * const first = &*itfirst;
+ Paragraph * const behind = &*itbehind;
lyx::Assert(first);
int before_number = -1;
// Create a new Undo.
std::vector<Paragraph *> undo_pars;
- Paragraph * start = first;
- Paragraph * end = 0;
+ Paragraph const * end = 0;
if (behind)
- end = const_cast<Paragraph*>(behind->previous());
+ end = behind->previous();
else {
- end = start;
+ end = first;
while (end->next())
end = end->next();
}
- if (start && end && (start != end->next()) &&
+
+ if (first && end && (first != end->next()) &&
((before_number != behind_number) ||
((before_number < 0) && (behind_number < 0))))
{
- Paragraph * tmppar = start;
- undo_pars.push_back(new Paragraph(*tmppar, true));
-
- while (tmppar != end && tmppar->next()) {
+ undo_pars.push_back(new Paragraph(*first, true));
+ for (Paragraph * tmppar = first; tmppar != end && tmppar->next(); ) {
tmppar = tmppar->next();
undo_pars.push_back(new Paragraph(*tmppar, true));
size_t const n = undo_pars.size();
int cursor_par = undoCursor(bv).par()->id();
int cursor_pos = undoCursor(bv).pos();
+ //lyxerr << "createUndo: inset_id: " << inset_id << " before_number: "
+ // << before_number << " behind_number: " << behind_number << "\n";
u.reset(new Undo(kind, inset_id,
before_number, behind_number,
cursor_par, cursor_pos, undo_pars));
if (first && first->next())
first = first->next();
else if (!first)
- first = firstUndoParagraph(bv, undo->number_of_inset_id);
+ first = &*undoParagraphs(bv, undo->number_of_inset_id).begin();
if (first) {
shared_ptr<Undo> u;
if (createUndo(bv, undo->kind, first,
projects / lyx.git / blobdiff