changelogs

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 9059d657113739cc7dc6da31f7dd7244a2005e5f..62c17dbb500b0778d062713acdf99a9b2b192880 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;
@@ -90,6 +92,7 @@ using std::istringstream;
 using std::make_pair;
 using std::min;
 using std::string;
+using std::mem_fun_ref;
 
 
 extern BufferList bufferlist;
@@ -327,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;
@@ -355,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();
@@ -382,7 +389,7 @@ bool BufferView::Pimpl::fitCursor()
 {
        // to get the correct y cursor info
        lyxerr[Debug::DEBUG] << "BufferView::fitCursor" << std::endl;
-       lyx::par_type const pit = bv_->cursor().bottom().par();
+       lyx::pit_type const pit = bv_->cursor().bottom().pit();
        bv_->text()->redoParagraph(pit);
        refreshPar(*bv_, *bv_->text(), pit);
 
@@ -595,7 +602,7 @@ void BufferView::Pimpl::update()
                buffer_->buildMacros();
 
                // update all 'visible' paragraphs
-               lyx::par_type beg, end;
+               lyx::pit_type beg, end;
                getParsInRange(buffer_->paragraphs(),
                               top_y(), top_y() + workarea().workHeight(),
                               beg, end);
@@ -650,7 +657,7 @@ Change const BufferView::Pimpl::getCurrentChange()
        if (!cur.selection())
                return Change(Change::UNCHANGED);
 
-       return text->getPar(cur.selBegin().par()).
+       return text->getPar(cur.selBegin().pit()).
                        lookupChangeFull(cur.selBegin().pos());
 }
 
@@ -804,10 +811,10 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filenm)
        BOOST_ASSERT(bv_->cursor().inTexted());
 
        string const fname = MakeAbsPath(filename);
-       bool const res = bv_->buffer()->readFile(fname, bv_->cursor().par());
+       bool const res = bv_->buffer()->readFile(fname, bv_->cursor().pit());
        bv_->resize();
 
-  string s = res ? _("Document %1$s inserted.")
+       string s = res ? _("Document %1$s inserted.")
                       : _("Could not insert document %1$s");
        owner_->message(bformat(s, disp_fn));
 }
@@ -819,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
@@ -838,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;
        }