Fix bug 4463. The crash was due to a call to X from inside a child process.

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 2cab32ff7ad75f844870a020979afafb723ddd7b..d470a294f9cc3b83ae3dcb0168c5045032c0f4d0 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -21,10 +21,8 @@
 #include "BufferView.h"
 #include "Changes.h"
 #include "Cursor.h"
-#include "debug.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "gettext.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
 #include "Language.h"
@@ -46,35 +44,28 @@
 #include "mathed/InsetMath.h"
 #include "mathed/MathSupport.h"
 
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
 #include "support/limited_stack.h"
 #include "support/lstrings.h"
-#include "support/docstream.h"
 
 #include "frontends/Clipboard.h"
 #include "frontends/Selection.h"
 
-#include <boost/current_function.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/next_prior.hpp>
 
 #include <string>
 
-using std::endl;
-using std::for_each;
-using std::make_pair;
-using std::pair;
-using std::vector;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using frontend::Clipboard;
-
 namespace {
 
-typedef std::pair<pit_type, int> PitPosPair;
+typedef pair<pit_type, int> PitPosPair;
 
 typedef limited_stack<pair<ParagraphList, TextClassPtr> > CutStack;
 
@@ -96,11 +87,11 @@ void region(CursorSlice const & i1, CursorSlice const & i2,
        c1 = p.col(i1.idx());
        c2 = p.col(i2.idx());
        if (c1 > c2)
-               std::swap(c1, c2);
+               swap(c1, c2);
        r1 = p.row(i1.idx());
        r2 = p.row(i2.idx());
        if (r1 > r2)
-               std::swap(r1, r2);
+               swap(r1, r2);
 }
 
 
@@ -340,7 +331,7 @@ void putClipboard(ParagraphList const & paragraphs, TextClassPtr textclass,
        buffer.setUnnamed(true);
        buffer.paragraphs() = paragraphs;
        buffer.params().setTextClass(textclass);
-       std::ostringstream lyx;
+       ostringstream lyx;
        if (buffer.write(lyx))
                theClipboard().put(lyx.str(), plaintext);
        else
@@ -471,7 +462,7 @@ void switchBetweenClasses(TextClassPtr const & c1,
 }
 
 
-std::vector<docstring> const availableSelections(Buffer const & buffer)
+vector<docstring> const availableSelections(Buffer const & buffer)
 {
        vector<docstring> selList;
 
@@ -647,7 +638,7 @@ void copySelectionToStack()
 void copySelection(Cursor & cur, docstring const & plaintext)
 {
        // In tablemode, because copy and paste actually use special table stack
-       // we do not attemp to get selected paragraphs under cursor. Instead, a
+       // we do not attempt to get selected paragraphs under cursor. Instead, a
        // paragraph with the plain text version is generated so that table cells
        // can be pasted as pure text somewhere else.
        if (cur.selBegin().idx() != cur.selEnd().idx()) {
@@ -658,8 +649,9 @@ void copySelection(Cursor & cur, docstring const & plaintext)
                par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
                theCuts.push(make_pair(pars, bp.getTextClassPtr()));
-       } else
+       } else {
                copySelectionToStack(cur, theCuts);
+       }
 
        // stuff the selection onto the X clipboard, from an explicit copy request
        putClipboard(theCuts[0].first, theCuts[0].second, plaintext);
@@ -674,9 +666,7 @@ void saveSelection(Cursor & cur)
        if (cur.selection() 
            && cur.selBegin() == cur.bv().cursor().selBegin()
            && cur.selEnd() == cur.bv().cursor().selEnd()) {
-               LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION << ": `"
-                          << to_utf8(cur.selectionAsString(true)) << "'."
-                          << endl;
+               LYXERR(Debug::ACTION, "'" << cur.selectionAsString(true) << "'");
                copySelectionToStack(cur, selectionBuffer);
        }
 }
@@ -887,7 +877,7 @@ docstring grabSelection(Cursor const & cur)
 
        // FIXME: What is wrong with the following?
 #if 0
-       std::ostringstream os;
+       ostringstream os;
        for (DocIterator dit = cur.selectionBegin();
             dit != cur.selectionEnd(); dit.forwardPos())
                os << asString(dit.cell());