Trivial whitespace fix.

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 2d4288a0fe3c693ad5f6a566a90c97ae7e3a44ef..4f2fe0a334747319a2fb86844188b8ad3c4d3074 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -209,32 +209,33 @@ void BufferView::setBuffer(Buffer * b)
        if (!buffer_)
                return;
 
-               LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
-                                   << "Buffer addr: " << buffer_ << endl;
-               cursor_.push(buffer_->inset());
+       LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
+                                       << "Buffer addr: " << buffer_ << endl;
+       cursor_.push(buffer_->inset());
+       cursor_.resetAnchor();
+       buffer_->text().setCurrentFont(cursor_);
+       if (buffer_->getCursor().size() > 0 &&
+                       buffer_->getAnchor().size() > 0)
+       {
+               cursor_.setCursor(buffer_->getAnchor().asDocIterator(&(buffer_->inset())));
                cursor_.resetAnchor();
-               buffer_->text().setCurrentFont(cursor_);
-               if (buffer_->getCursor().size() > 0 &&
-                   buffer_->getAnchor().size() > 0)
-               {
-                       cursor_.setCursor(buffer_->getAnchor().asDocIterator(&(buffer_->inset())));
-                       cursor_.resetAnchor();
-                       cursor_.setCursor(buffer_->getCursor().asDocIterator(&(buffer_->inset())));
-                       cursor_.setSelection();
-                       // do not set selection to the new buffer because we
-                       // only paste recent selection.
-
-                       // Make sure that the restored cursor is not broken. This can happen for
-                       // example if this Buffer has been modified by another view.
-                       cursor_.fixIfBroken();
-               }
-               updateMetrics(false);
+               cursor_.setCursor(buffer_->getCursor().asDocIterator(&(buffer_->inset())));
+               cursor_.setSelection();
+               // do not set selection to the new buffer because we
+               // only paste recent selection.
+
+               // Make sure that the restored cursor is not broken. This can happen for
+               // example if this Buffer has been modified by another view.
+               cursor_.fixIfBroken();
+       }
+       updateMetrics(false);
        if (graphics::Previews::status() != LyXRC::PREVIEW_OFF)
                graphics::Previews::get().generateBufferPreviews(*buffer_);
 }
 
-
-bool BufferView::loadLyXFile(FileName const & filename, bool tolastfiles)
+// FIXME There is now no need for this to be in BufferView. It should all
+// be moved to buffer_func.cpp. (Abdel)
+Buffer * BufferView::loadLyXFile(FileName const & filename, bool auto_open)
 {
        // File already open?
        if (theBufferList().exists(filename.absFilename())) {
@@ -246,12 +247,13 @@ bool BufferView::loadLyXFile(FileName const & filename, bool tolastfiles)
                        text, 0, 1,  _("&Revert"), _("&Switch to document"));
 
                if (ret != 0) {
-                       setBuffer(theBufferList().getBuffer(filename.absFilename()));
-                       return true;
+      Buffer * buf = theBufferList().getBuffer(filename.absFilename());
+                       setBuffer(buf);
+                       return buf;
                }
                // FIXME: should be LFUN_REVERT
                if (!theBufferList().close(theBufferList().getBuffer(filename.absFilename()), false))
-                       return false;
+                       return 0;
                // Fall through to new load. (Asger)
                buffer_ = 0;
        }
@@ -262,7 +264,7 @@ bool BufferView::loadLyXFile(FileName const & filename, bool tolastfiles)
                b = theBufferList().newBuffer(filename.absFilename());
                if (!lyx::loadLyXFile(b, filename)) {
                        theBufferList().release(b);
-                       return false;
+                       return 0;
                }
        } else {
                docstring text = bformat(_("The document %1$s does not yet "
@@ -274,34 +276,15 @@ bool BufferView::loadLyXFile(FileName const & filename, bool tolastfiles)
                if (ret == 0) {
                        b = newFile(filename.absFilename(), string(), true);
                        if (!b)
-                               return false;
+                               return 0;
                } else
-                       return false;
+                       return 0;
        }
 
-       setBuffer(b);
-       // Send the "errors" signal in case of parsing errors
-       b->errors("Parse");
+  if (!auto_open)
+       setBuffer(b);
 
-       // Update the labels and section numbering.
-       updateLabels(*buffer_);
-       // scroll to the position when the file was last closed
-       if (lyxrc.use_lastfilepos) {
-               pit_type pit;
-               pos_type pos;
-               boost::tie(pit, pos) = LyX::ref().session().lastFilePos().load(filename);
-               // if successfully move to pit (returned par_id is not zero), update metrics and reset font
-               if (moveToPosition(pit, pos, 0, 0).get<1>()) {
-                       if (fitCursor())
-                               updateMetrics(false);
-                       buffer_->text().setCurrentFont(cursor_);
-               }
-       }
-
-       if (tolastfiles)
-               LyX::ref().session().lastFiles().add(FileName(b->fileName()));
-
-       return true;
+       return b;
 }
 
 
@@ -628,15 +611,14 @@ boost::tuple<pit_type, pos_type, int> BufferView::moveToPosition(pit_type bottom
 
 void BufferView::translateAndInsert(char_type c, Text * t, Cursor & cur)
 {
-       if (!lyxrc.rtl_support)
-               return;
-
-       if (cursor_.innerText()->real_current_font.isRightToLeft()) {
-               if (intl_->keymap == Intl::PRIMARY)
-                       intl_->keyMapSec();
-       } else {
-               if (intl_->keymap == Intl::SECONDARY)
-                       intl_->keyMapPrim();
+       if (lyxrc.rtl_support) {
+               if (cursor_.innerText()->real_current_font.isRightToLeft()) {
+                       if (intl_->keymap == Intl::PRIMARY)
+                               intl_->keyMapSec();
+               } else {
+                       if (intl_->keymap == Intl::SECONDARY)
+                               intl_->keyMapPrim();
+               }
        }
        
        intl_->getTransManager().translateAndInsert(c, t, cur);