InsetText in;
std::swap(in.paragraphs(), pars);
-
- ParIterator end = ParIterator(DocumentIterator());
- for (ParIterator it = ParIterator(in, 0); it != end; ++it) {
+
+ ParIterator end = par_iterator_end(in);
+ for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
string const name = it->layout()->name();
bool hasLayout = tclass2.hasLayout(name);
InsetText in;
std::swap(in.paragraphs(), insertion);
- ParIterator fpit = ParIterator(in, 0);
- ParIterator fend = ParIterator(DocumentIterator());
+ ParIterator fpit = par_iterator_begin(in);
+ ParIterator fend = par_iterator_end(in);
for (; fpit != fend; ++fpit) {
InsetList::iterator lit = fpit->insetlist.begin();
}
}
std::swap(in.paragraphs(), insertion);
-
+
// Split the paragraph for inserting the buf if necessary.
bool did_split = false;
if (pars[pit].size() || pit + 1 == par_type(pars.size())) {
mergeParagraph(buffer.params(), pars, pit);
par_type last_paste = pit + insertion.size() - 1;
-
+
// Store the new cursor position.
pit = last_paste;
pos = pars[last_paste].size();
int endpos = cur.selEnd().pos();
- BufferParams const & bufparams = cur.bv().buffer()->params();
+ BufferParams const & bufparams = cur.buffer().params();
boost::tie(endpit, endpos) = realcut ?
cutSelection(bufparams,
text->paragraphs(),
++pos;
copySelection(pars, par, cur.selEnd().par(),
- pos, cur.selEnd().pos(), cur.bv().buffer()->params().textclass);
+ pos, cur.selEnd().pos(), cur.buffer().params().textclass);
}
ErrorList el;
boost::tie(ppp, endpit) =
- pasteSelection(*cur.bv().buffer(),
+ pasteSelection(cur.buffer(),
text->paragraphs(),
cur.par(), cur.pos(),
- cur.bv().buffer()->params().textclass,
+ cur.buffer().params().textclass,
sel_index, el);
- bufferErrors(*cur.bv().buffer(), el);
- text->bv()->showErrorList(_("Paste"));
+ bufferErrors(cur.buffer(), el);
+ cur.bv().showErrorList(_("Paste"));
text->redoParagraphs(cur.par(), endpit);
// Get font setting before we cut
pos_type pos = cur.selEnd().pos();
LyXFont const font = text->getPar(cur.selBegin().par()).
- getFontSettings(cur.bv().buffer()->params(), cur.selBegin().pos());
+ getFontSettings(cur.buffer().params(), cur.selBegin().pos());
// Insert the new string
string::const_iterator cit = str.begin();