Fix #1736

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index d80723d200b0969b40483bbc50bb09e009e4ace4..2f8ebd9764e52db73fd2e2cddf02eda0bb2945e0 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -72,6 +72,8 @@
 
 #include <boost/bind.hpp>
 
+#include <functional>
+
 using lyx::pos_type;
 
 using lyx::support::AddPath;
@@ -81,6 +83,7 @@ using lyx::support::FileSearch;
 using lyx::support::ForkedcallsController;
 using lyx::support::IsDirWriteable;
 using lyx::support::MakeDisplayPath;
+using lyx::support::MakeAbsPath;
 using lyx::support::strToUnsignedInt;
 using lyx::support::system_lyxdir;
 
@@ -89,6 +92,7 @@ using std::istringstream;
 using std::make_pair;
 using std::min;
 using std::string;
+using std::mem_fun_ref;
 
 
 extern BufferList bufferlist;
@@ -326,8 +330,17 @@ void BufferView::Pimpl::setBuffer(Buffer * b)
        if (buffer_)
                disconnectBuffer();
 
-       // set current buffer
-       buffer_ = b;
+       // if we are closing current buffer, switch to the first in
+       // buffer list.
+       if (!b) {
+               lyxerr[Debug::INFO] << "  No Buffer!" << endl;
+               // we are closing the buffer, use the first buffer as current
+               buffer_ = bufferlist.first();
+               owner_->getDialogs().hideBufferDependent();
+       } else {
+               // set current buffer
+               buffer_ = b;
+       }
 
        // reset old cursor
        top_y_ = 0;
@@ -354,11 +367,6 @@ void BufferView::Pimpl::setBuffer(Buffer * b)
                // hidden. This should go here because some dialogs (eg ToC)
                // require bv_->text.
                owner_->getDialogs().updateBufferDependent(true);
-       } else {
-               lyxerr[Debug::INFO] << "  No Buffer!" << endl;
-               // we are closing the buffer, use the first buffer as current
-               buffer_ = bufferlist.first();
-               owner_->getDialogs().hideBufferDependent();
        }
 
        update();
@@ -796,12 +804,19 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filenm)
 
        string const disp_fn = MakeDisplayPath(filename);
        owner_->message(bformat(_("Inserting document %1$s..."), disp_fn));
-       if (bv_->insertLyXFile(filename))
-               owner_->message(bformat(_("Document %1$s inserted."),
-                                       disp_fn));
-       else
-               owner_->message(bformat(_("Could not insert document %1$s"),
-                                       disp_fn));
+
+       bv_->cursor().clearSelection();
+       bv_->text()->breakParagraph(bv_->cursor());
+
+       BOOST_ASSERT(bv_->cursor().inTexted());
+
+       string const fname = MakeAbsPath(filename);
+       bool const res = bv_->buffer()->readFile(fname, bv_->cursor().par());
+       bv_->resize();
+
+       string s = res ? _("Document %1$s inserted.")
+                      : _("Could not insert document %1$s");
+       owner_->message(bformat(s, disp_fn));
 }
 
 
@@ -811,9 +826,9 @@ void BufferView::Pimpl::trackChanges()
        bool const tracking = buf->params().tracking_changes;
 
        if (!tracking) {
-               ParIterator const end = buf->par_iterator_end();
-               for (ParIterator it = buf->par_iterator_begin(); it != end; ++it)
-                       it->trackChanges();
+               for_each(buf->par_iterator_begin(),
+                        buf->par_iterator_end(),
+                        bind(&Paragraph::trackChanges, _1, Change::UNCHANGED));
                buf->params().tracking_changes = true;
 
                // we cannot allow undos beyond the freeze point
@@ -830,9 +845,10 @@ void BufferView::Pimpl::trackChanges()
                        return;
                }
 
-               ParIterator const end = buf->par_iterator_end();
-               for (ParIterator it = buf->par_iterator_begin(); it != end; ++it)
-                       it->untrackChanges();
+               for_each(buf->par_iterator_begin(),
+                        buf->par_iterator_end(),
+                        mem_fun_ref(&Paragraph::untrackChanges));
+
                buf->params().tracking_changes = false;
        }
 
@@ -876,8 +892,9 @@ bool BufferView::Pimpl::workAreaDispatch(FuncRequest const & cmd0)
 
        // Build temporary cursor.
        InsetBase * inset = bv_->text()->editXY(cur, cmd.x, cmd.y);
-       lyxerr << "hit inset at tip: " << inset << endl;
-       lyxerr << "created temp cursor:\n" << cur << endl;
+       lyxerr << " * created temp cursor: " << inset << endl;
+       lyxerr << " * hit inset at tip: " << inset << endl;
+       lyxerr << " * created temp cursor:" << cur << endl;
 
        // Put anchor at the same position.
        cur.resetAnchor();
@@ -885,7 +902,7 @@ bool BufferView::Pimpl::workAreaDispatch(FuncRequest const & cmd0)
        // Try to dispatch to an non-editable inset near this position
        // via the temp cursor. If the inset wishes to change the real
        // cursor it has to do so explicitly by using
-       //  cur.bv().cursor() = cur;  (or similar)'
+       //  cur.bv().cursor() = cur;  (or similar)
        if (inset)
                inset->dispatch(cur, cmd);