* remove various xforms relicts, in particular:

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 1b652813253ddbe8178ade578dec03def613373f..a418054c952382dbd83f9411f299e62bad8fc234 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -45,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;
@@ -53,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;
@@ -150,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();
@@ -200,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);
@@ -223,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)
@@ -368,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) {
@@ -432,8 +442,6 @@ void switchBetweenClasses(textclass_type c1, textclass_type c2,
                        }
                }
        }
-
-       std::swap(in.paragraphs(), pars);
 }
 
 
@@ -491,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);
@@ -554,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())