* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index 8771f0d2e5315188481bf5d7d8ec964dd636496b..29ad13b273bf25b7c66faf71ff4e2a3b177c8199 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -63,7 +63,6 @@
 #include "frontends/Alert.h"
 #include "frontends/FileDialog.h"
 #include "frontends/FontMetrics.h"
-#include "frontends/Selection.h"
 
 #include "graphics/Previews.h"
 
@@ -209,7 +208,8 @@ void BufferView::setBuffer(Buffer * b)
                        cursor_.resetAnchor();
                        cursor_.setCursor(buffer_->getCursor().asDocIterator(&(buffer_->inset())));
                        cursor_.setSelection();
-                       theSelection().haveSelection(cursor_.selection());
+                       // do not set selection to the new buffer because we
+                       // only paste recent selection.
                }
        }
 
@@ -682,8 +682,7 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 
        case LFUN_CHANGES_OUTPUT: {
                OutputParams runparams;
-               LaTeXFeatures features(*buffer_, buffer_->params(), runparams);
-               flag.enabled(buffer_ && features.isAvailable("dvipost"));
+               flag.enabled(buffer_ && LaTeXFeatures::isAvailable("dvipost"));
                flag.setOnOff(buffer_->params().outputChanges);
                break;
        }
@@ -1054,6 +1053,10 @@ void BufferView::clearSelection()
 {
        if (buffer_) {
                cursor_.clearSelection();
+               // Clear the selection buffer. Otherwise a subsequent
+               // middle-mouse-button paste would use the selection buffer,
+               // not the more current external selection.
+               cap::clearSelection();
                xsel_cache_.set = false;
                // The buffer did not really change, but this causes the
                // redraw we need because we cleared the selection above.
@@ -1322,8 +1325,6 @@ bool BufferView::mouseSetCursor(LCursor & cur)
 
        cursor_.setCursor(dit);
        cursor_.clearSelection();
-       // remember new position.
-       cursor_.setTargetX();
        finishUndo();
        return update;
 }
@@ -1342,7 +1343,7 @@ void BufferView::putSelectionAt(DocIterator const & cur,
                        cursor_.setSelection(cursor_, -length);
                } else
                        cursor_.setSelection(cursor_, length);
-               theSelection().haveSelection(cursor_.selection());
+               cap::saveSelection(cursor_);
        }
 }