the Paragraph::inInset() changes

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 4d291f38d8b6c076748f6fc83a500cd6e19ffefc..0cd4a1a33418087d0b6e78f120d94efcdca53b42 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -84,9 +84,9 @@ int SwitchLayoutsBetweenClasses(textclass_type c1, textclass_type c2,
 
        InsetText in;
        std::swap(in.paragraphs(), pars);
-       
-       ParIterator end = ParIterator(in, pars.size());
-       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);
 
@@ -309,8 +309,8 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars,
        InsetText in;
        std::swap(in.paragraphs(), insertion);
 
-       ParIterator fpit(in, 0);
-       ParIterator fend(in, insertion.size());
+       ParIterator fpit = par_iterator_begin(in);
+       ParIterator fend = par_iterator_end(in);
 
        for (; fpit != fend; ++fpit) {
                InsetList::iterator lit = fpit->insetlist.begin();
@@ -330,7 +330,7 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars,
                }
        }
        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())) {
@@ -343,7 +343,7 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars,
        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();
@@ -416,7 +416,7 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut)
 
        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(),
@@ -470,7 +470,7 @@ void copySelection(LCursor & cur)
                ++pos;
 
        copySelection(pars, par, cur.selEnd().par(),
-               pos, cur.selEnd().pos(), cur.bv().buffer()->params().textclass);
+               pos, cur.selEnd().pos(), cur.buffer().params().textclass);
 }
 
 
@@ -490,13 +490,13 @@ void pasteSelection(LCursor & cur, size_t sel_index)
        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);
 
@@ -531,7 +531,7 @@ void replaceSelectionWithString(LCursor & cur, string const & str)
        // 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();