Revert 23154.

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 9347e3c76a43f4678ebb4159b7a69219f864f564..fecfb6979b8b24d6f204619c61f05f2eb6f11f58 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -1,4 +1,4 @@
-/*
+/**
  * \file CutAndPaste.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
@@ -127,11 +127,11 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 
        // Convert newline to paragraph break in ERT inset.
        // This should not be here!
-       if (pars[pit].inInset() &&
-           (pars[pit].inInset()->lyxCode() == ERT_CODE ||
-               pars[pit].inInset()->lyxCode() == LISTINGS_CODE)) {
-               for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) {
-                       for (pos_type j = 0; j < insertion[i].size(); ++j) {
+       Inset * inset = pars[pit].inInset();
+       if (inset && (inset->lyxCode() == ERT_CODE ||
+                       inset->lyxCode() == LISTINGS_CODE)) {
+               for (size_t i = 0; i != insertion.size(); ++i) {
+                       for (pos_type j = 0; j != insertion[i].size(); ++j) {
                                if (insertion[i].isNewline(j)) {
                                        // do not track deletion of newline
                                        insertion[i].eraseChar(j, false);
@@ -152,7 +152,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
                ParagraphList::iterator const end = insertion.end();
                for (ParagraphList::iterator par = insertion.begin();
                                par != end; ++par)
-                       par->layout(layout);
+                       par->setLayout(layout);
        }
 
        // Make sure there is no class difference.
@@ -217,21 +217,10 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        ParIterator fend = par_iterator_end(in);
 
        for (; fpit != fend; ++fpit) {
-               InsetList::const_iterator lit = fpit->insetList().begin();
-               InsetList::const_iterator eit = fpit->insetList().end();
-
-               for (; lit != eit; ++lit) {
-                       switch (lit->inset->lyxCode()) {
-                       case TABULAR_CODE: {
-                               InsetTabular * it = static_cast<InsetTabular*>(lit->inset);
-                               it->buffer(&buffer);
-                               break;
-                       }
-
-                       default:
-                               break; // nothing
-                       }
-               }
+               InsetList::const_iterator it = fpit->insetList().begin();
+               InsetList::const_iterator et = fpit->insetList().end();
+               for (; it != et; ++it)
+                               it->inset->setBuffer(const_cast<Buffer *>(&buffer));
        }
        insertion.swap(in.paragraphs());
 
@@ -310,7 +299,9 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
 
                // Separate handling of paragraph break:
                if (merge && pit != endpit &&
-                   (pit + 1 != endpit || pars[pit].hasSameLayout(pars[endpit]))) {
+                   (pit + 1 != endpit 
+                    || pars[pit].hasSameLayout(pars[endpit])
+                    || pars[endpit].size() == endpos)) {
                        if (pit + 1 == endpit)
                                endpos += pars[pit].size();
                        mergeParagraph(params, pars, pit);
@@ -420,9 +411,9 @@ void switchBetweenClasses(TextClassPtr const & oldone,
                bool hasLayout = newtc.hasLayout(name);
 
                if (hasLayout)
-                       it->layout(newtc[name]);
+                       it->setLayout(newtc[name]);
                else
-                       it->layout(newtc.defaultLayout());
+                       it->setLayout(newtc.defaultLayout());
 
                if (!hasLayout && name != oldtc.defaultLayoutName()) {
                        docstring const s = bformat(
@@ -447,7 +438,7 @@ void switchBetweenClasses(TextClassPtr const & oldone,
                        // FIXME: Should we verify all InsetCollapsable?
                        continue;
                inset->setLayout(newone);
-               if (inset->getLayout().labelstring != from_utf8("UNDEFINED"))
+               if (!inset->undefined())
                        continue;
                // The flex inset is undefined in newtc
                docstring const s = bformat(_(
@@ -620,7 +611,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
                ParagraphList pars;
                Paragraph par;
                BufferParams const & bp = cur.buffer().params();
-               par.layout(bp.getTextClass().defaultLayout());
+               par.setLayout(bp.getTextClass().defaultLayout());
                par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
                cutstack.push(make_pair(pars, bp.getTextClassPtr()));
@@ -647,7 +638,7 @@ void copySelection(Cursor & cur, docstring const & plaintext)
                ParagraphList pars;
                Paragraph par;
                BufferParams const & bp = cur.buffer().params();
-               par.layout(bp.getTextClass().defaultLayout());
+               par.setLayout(bp.getTextClass().defaultLayout());
                par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
                theCuts.push(make_pair(pars, bp.getTextClassPtr()));