Change mouse cursor on tabular selection zones

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index a521e1434ef32fa5506f457eb326b23756018cc5..5f3e8090fb524aa7d030309fe32e0bea46019da3 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -387,7 +387,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
 
        // Paste it!
        if (empty) {
-               pars.insert(next(pars.begin(), pit),
+               pars.insert(lyx::next(pars.begin(), pit),
                            insertion.begin(),
                            insertion.end());
 
@@ -395,7 +395,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
                mergeParagraph(buffer.params(), pars,
                               pit + insertion.size() - 1);
        } else {
-               pars.insert(next(pars.begin(), pit + 1),
+               pars.insert(lyx::next(pars.begin(), pit + 1),
                            insertion.begin(),
                            insertion.end());
 
@@ -599,8 +599,8 @@ void copySelectionHelper(Buffer const & buf, Text const & text,
        LASSERT(startpit != endpit || start <= end, return);
 
        // Clone the paragraphs within the selection.
-       ParagraphList copy_pars(next(pars.begin(), startpit),
-                               next(pars.begin(), endpit + 1));
+       ParagraphList copy_pars(lyx::next(pars.begin(), startpit),
+                               lyx::next(pars.begin(), endpit + 1));
 
        // Remove the end of the last paragraph; afterwards, remove the
        // beginning of the first paragraph. Keep this order - there may only
@@ -961,20 +961,11 @@ void copySelectionToStack(Cursor const & cur, CutStack & cutstack)
                LBUFERR(text);
                // ok we have a selection. This is always between cur.selBegin()
                // and sel_end cursor
-
-               // copy behind a space if there is one
-               ParagraphList & pars = text->paragraphs();
-               pos_type pos = cur.selBegin().pos();
-               pit_type par = cur.selBegin().pit();
-               while (pos < pars[par].size() &&
-                      pars[par].isLineSeparator(pos) &&
-                      (par != cur.selEnd().pit() || pos < cur.selEnd().pos()))
-                       ++pos;
-
-               copySelectionHelper(*cur.buffer(), *text, par, cur.selEnd().pit(),
-                       pos, cur.selEnd().pos(), 
-                       cur.buffer()->params().documentClassPtr(), cutstack);
-
+               copySelectionHelper(*cur.buffer(), *text,
+                                   cur.selBegin().pit(), cur.selEnd().pit(),
+                                   cur.selBegin().pos(), cur.selEnd().pos(), 
+                                   cur.buffer()->params().documentClassPtr(),
+                                   cutstack);
                // Reset the dirty_tabular_stack_ flag only when something
                // is copied to the clipboard (not to the selectionBuffer).
                if (&cutstack == &theCuts)