Revert unintentional commits.

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 2f41a497a2989e0921f5f904b93f705a1ea128b8..3f1bb23596a8d01b7d9fb97701ad66ba5f6b31b4 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -282,7 +282,7 @@ BufferView::BufferView(Buffer & buf)
        d->cursor_.setCurrentFont();
 
        if (graphics::Previews::status() != LyXRC::PREVIEW_OFF)
-               thePreviews()->generateBufferPreviews(buffer_);
+               thePreviews().generateBufferPreviews(buffer_);
 }
 
 
@@ -296,7 +296,7 @@ BufferView::~BufferView()
        LastFilePosSection::FilePos fp;
        fp.pit = d->cursor_.bottom().pit();
        fp.pos = d->cursor_.bottom().pos();
-       LyX::ref().session().lastFilePos().save(buffer_.fileName(), fp);
+       theSession().lastFilePos().save(buffer_.fileName(), fp);
 
        delete d;
 }
@@ -659,7 +659,7 @@ void BufferView::saveBookmark(unsigned int idx)
        // acturately locate a bookmark in a 'live' lyx session.
        // pit and pos will be updated with bottom level pit/pos
        // when lyx exits.
-       LyX::ref().session().bookmarks().save(
+       theSession().bookmarks().save(
                buffer_.fileName(),
                d->cursor_.bottom().pit(),
                d->cursor_.bottom().pos(),
@@ -1072,9 +1072,12 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                if (!inset || !cur.result().dispatched())
                        cur.dispatch(cmd);
 
+               // FIXME I'm adding the last break to solve a crash,
+               // but that is obviously not right.
                if (!cur.result().dispatched())
                        // It did not work too; no action needed.
                        break;
+               break;
        }
 
        case LFUN_PARAGRAPH_GOTO: {
@@ -1488,6 +1491,7 @@ docstring const BufferView::requestSelection()
                return docstring();
        }
 
+       LYXERR(Debug::SELECTION, "requestSelection: xsel_cache.set: " << d->xsel_cache_.set);
        if (!d->xsel_cache_.set ||
            cur.top() != d->xsel_cache_.cursor ||
            cur.anchor_.top() != d->xsel_cache_.anchor)