* remove various xforms relicts, in particular:

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 57f84ed88bb639593c7fe0a6f76a09debde87d4e..a418054c952382dbd83f9411f299e62bad8fc234 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -24,6 +24,7 @@
 #include "funcrequest.h"
 #include "gettext.h"
 #include "insetiterator.h"
+#include "language.h"
 #include "lfuns.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
@@ -44,6 +45,10 @@
 
 #include "support/lstrings.h"
 
+#include "frontends/Gui.h"
+#include "frontends/LyXView.h"
+#include "frontends/Clipboard.h"
+
 #include <boost/tuple/tuple.hpp>
 
 using lyx::pos_type;
@@ -52,6 +57,9 @@ using lyx::textclass_type;
 
 using lyx::support::bformat;
 
+using lyx::frontend::Gui;
+using lyx::frontend::Clipboard;
+
 using std::endl;
 using std::for_each;
 using std::make_pair;
@@ -73,12 +81,22 @@ CutStack theCuts(10);
 // when we (hopefully) have a one-for-all paste mechanism.
 bool dirty_tabular_stack_;
 
-class resetOwnerAndChanges : public std::unary_function<Paragraph, void> {
+class resetParagraph : public std::unary_function<Paragraph, Buffer const &> {
 public:
+       resetParagraph(Buffer const & b) : buffer_(b) {}
        void operator()(Paragraph & p) const {
                p.cleanChanges();
+               // ERT paragraphs have the Language latex_language.
+               // This is invalid outside of ERT, so we need to change it
+               // to the buffer language.
+               if (p.ownerCode() == InsetBase::ERT_CODE) {
+                       p.changeLanguage(buffer_.params(), latex_language,
+                                        buffer_.getLanguage());
+               }
                p.setInsetOwner(0);
        }
+private:
+       Buffer const & buffer_;
 };
 
 
@@ -139,7 +157,14 @@ pasteSelectionHelper(Buffer const & buffer,
        }
 
        // Make sure there is no class difference.
-       lyx::cap::switchBetweenClasses(textclass, tc, insertion, errorlist);
+       InsetText in;
+       // This works without copying any paragraph data because we have
+       // a specialized swap method for ParagraphList. This is important
+       // since we store pointers to insets at some places and we don't
+       // want to invalidate them.
+       insertion.swap(in.paragraphs());
+       lyx::cap::switchBetweenClasses(textclass, tc, in, errorlist);
+       insertion.swap(in.paragraphs());
 
        ParagraphList::iterator tmpbuf = insertion.begin();
        int depth_delta = pars[pit].params().depth() - tmpbuf->params().depth();
@@ -189,8 +214,7 @@ pasteSelectionHelper(Buffer const & buffer,
 
        // Prepare the paragraphs and insets for insertion.
        // A couple of insets store buffer references so need updating.
-       InsetText in;
-       std::swap(in.paragraphs(), insertion);
+       insertion.swap(in.paragraphs());
 
        ParIterator fpit = par_iterator_begin(in);
        ParIterator fend = par_iterator_end(in);
@@ -212,7 +236,7 @@ pasteSelectionHelper(Buffer const & buffer,
                        }
                }
        }
-       std::swap(in.paragraphs(), insertion);
+       insertion.swap(in.paragraphs());
 
        // Split the paragraph for inserting the buf if necessary.
        if (!empty)
@@ -294,7 +318,7 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
                pars[pit].erase(left, right);
                // Separate handling of para break:
                if (merge && pit != endpit &&
-                  pars[pit].hasSameLayout(pars[pit + 1])) {
+                  (pit + 1 != endpit || pars[pit].hasSameLayout(pars[pit + 1]))) {
                        pos_type const thissize = pars[pit].size();
                        if (doclear)
                                pars[pit + 1].stripLeadingSpaces();
@@ -313,7 +337,7 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
 }
 
 
-void copySelectionHelper(ParagraphList & pars,
+void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
        pit_type startpit, pit_type endpit,
        int start, int end, textclass_type tc)
 {
@@ -325,7 +349,7 @@ void copySelectionHelper(ParagraphList & pars,
        ParagraphList paragraphs(boost::next(pars.begin(), startpit),
                                 boost::next(pars.begin(), endpit + 1));
 
-       for_each(paragraphs.begin(), paragraphs.end(), resetOwnerAndChanges());
+       for_each(paragraphs.begin(), paragraphs.end(), resetParagraph(buf));
 
        // Cut out the end of the last paragraph.
        Paragraph & back = paragraphs.back();
@@ -357,18 +381,15 @@ string grabAndEraseSelection(LCursor & cur)
 
 
 void switchBetweenClasses(textclass_type c1, textclass_type c2,
-       ParagraphList & pars, ErrorList & errorlist)
+       InsetText & in, ErrorList & errorlist)
 {
-       BOOST_ASSERT(!pars.empty());
+       BOOST_ASSERT(!in.paragraphs().empty());
        if (c1 == c2)
                return;
 
        LyXTextClass const & tclass1 = textclasslist[c1];
        LyXTextClass const & tclass2 = textclasslist[c2];
 
-       InsetText in;
-       std::swap(in.paragraphs(), pars);
-
        // layouts
        ParIterator end = par_iterator_end(in);
        for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
@@ -421,8 +442,6 @@ void switchBetweenClasses(textclass_type c1, textclass_type c2,
                        }
                }
        }
-
-       std::swap(in.paragraphs(), pars);
 }
 
 
@@ -480,7 +499,8 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut)
                // finished. The solution used currently just works, to make it
                // faster we need to be more clever and probably also have more
                // calls to stuffClipboard. (Lgb)
-//             cur.bv().stuffClipboard(cur.selectionAsString(true));
+//             cur.bv().owner()->gui().clipboard().put(cur.selectionAsString(true));
+       
 
                // make sure that the depth behind the selection are restored, too
                recordUndoSelection(cur);
@@ -491,7 +511,8 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut)
 
                BufferParams const & bp = cur.buffer().params();
                if (realcut) {
-                       copySelectionHelper(text->paragraphs(),
+                       copySelectionHelper(cur.buffer(),
+                               text->paragraphs(),
                                begpit, endpit,
                                cur.selBegin().pos(), endpos,
                                bp.textclass);
@@ -542,7 +563,7 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut)
 void copySelection(LCursor & cur)
 {
        // stuff the selection onto the X clipboard, from an explicit copy request
-       cur.bv().stuffClipboard(cur.selectionAsString(true));
+       cur.bv().owner()->gui().clipboard().put(cur.selectionAsString(true));
 
        // this doesn't make sense, if there is no selection
        if (!cur.selection())
@@ -563,7 +584,7 @@ void copySelection(LCursor & cur)
                                         && (par != cur.selEnd().pit() || pos < cur.selEnd().pos()))
                        ++pos;
 
-               copySelectionHelper(pars, par, cur.selEnd().pit(),
+               copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(),
                        pos, cur.selEnd().pos(), cur.buffer().params().textclass);
        }
 
@@ -573,7 +594,7 @@ void copySelection(LCursor & cur)
                pars.push_back(Paragraph());
                BufferParams const & bp = cur.buffer().params();
                pars.back().layout(bp.getLyXTextClass().defaultLayout());
-               for_each(pars.begin(), pars.end(), resetOwnerAndChanges());
+               for_each(pars.begin(), pars.end(), resetParagraph(cur.buffer()));
                pars.back().insert(0, grabSelection(cur), LyXFont());
                theCuts.push(make_pair(pars, bp.textclass));
        }