Update of documentation in the source related to bug 4135 and the function callback...

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index e05c9f06c3d8ed3bb098f7d53134bf192e226927..491d4a0e7612fe07190e2bc7e456e9ab2fa23ff2 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -18,6 +18,7 @@
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
+#include "BufferView.h"
 #include "Cursor.h"
 #include "debug.h"
 #include "ErrorList.h"
@@ -413,6 +414,8 @@ docstring grabAndEraseSelection(Cursor & cur)
 void switchBetweenClasses(textclass_type c1, textclass_type c2,
        InsetText & in, ErrorList & errorlist)
 {
+       errorlist.clear();
+
        BOOST_ASSERT(!in.paragraphs().empty());
        if (c1 == c2)
                return;
@@ -423,7 +426,7 @@ void switchBetweenClasses(textclass_type c1, textclass_type c2,
        // layouts
        ParIterator end = par_iterator_end(in);
        for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
-               string const name = it->layout()->name();
+               docstring const name = it->layout()->name();
                bool hasLayout = tclass2.hasLayout(name);
 
                if (hasLayout)
@@ -435,7 +438,7 @@ void switchBetweenClasses(textclass_type c1, textclass_type c2,
                        docstring const s = bformat(
                                                 _("Layout had to be changed from\n%1$s to %2$s\n"
                                                "because of class conversion from\n%3$s to %4$s"),
-                        from_utf8(name), from_utf8(it->layout()->name()),
+                        name, it->layout()->name(),
                         from_utf8(tclass1.name()), from_utf8(tclass2.name()));
                        // To warn the user that something had to be done.
                        errorlist.push_back(ErrorItem(_("Changed Layout"), s,
@@ -524,6 +527,8 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
                Text * text = cur.text();
                BOOST_ASSERT(text);
 
+               saveSelection(cur);
+
                // make sure that the depth behind the selection are restored, too
                recordUndoSelection(cur);
                pit_type begpit = cur.selBegin().pit();
@@ -674,7 +679,9 @@ void saveSelection(Cursor & cur)
        // This function is called, not when a selection is formed, but when
        // a selection is cleared. Therefore, multiple keyboard selection
        // will not repeatively trigger this function (bug 3877).
-       if (cur.selection()) {
+       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;
@@ -784,7 +791,6 @@ void pasteSelection(Cursor & cur, ErrorList & errorList)
        recordUndo(cur);
        pasteParagraphList(cur, selectionBuffer[0].first,
                           selectionBuffer[0].second, errorList);
-       cur.setSelection();
 }
 
 
@@ -830,6 +836,7 @@ void eraseSelection(Cursor & cur)
        CursorSlice const & i1 = cur.selBegin();
        CursorSlice const & i2 = cur.selEnd();
        if (i1.inset().asInsetMath()) {
+               saveSelection(cur);
                cur.top() = i1;
                if (i1.idx() == i2.idx()) {
                        i1.cell().erase(i1.pos(), i2.pos());
@@ -850,7 +857,6 @@ void eraseSelection(Cursor & cur)
                }
                // need a valid cursor. (Lgb)
                cur.clearSelection();
-               theSelection().haveSelection(false);
        } else {
                lyxerr << "can't erase this selection 1" << endl;
        }