// We could be able to get rid of this if only every BufferView were
// associated to a buffer on construction.
DocIterator::DocIterator()
- : inset_(0)
+ : boundary_(false), inset_(0)
{}
DocIterator::DocIterator(InsetBase & inset)
- : inset_(&inset)
+ : boundary_(false), inset_(&inset)
{}
Row & DocIterator::textRow()
{
BOOST_ASSERT(!paragraph().rows().empty());
- return paragraph().getRow(pos());
+ return paragraph().getRow(pos(), boundary_);
}
Row const & DocIterator::textRow() const
{
BOOST_ASSERT(!paragraph().rows().empty());
- return paragraph().getRow(pos());
+ return paragraph().getRow(pos(), boundary_);
}
}
+void DocIterator::updateInsets(InsetBase * inset)
+{
+ // this function re-creates the cache of inset pointers.
+ // code taken in part from StableDocIterator::asDocIterator.
+ //lyxerr << "converting:\n" << *this << endl;
+ DocIterator dit = DocIterator(*inset);
+ size_t const n = slices_.size();
+ for (size_t i = 0 ; i < n; ++i) {
+ BOOST_ASSERT(inset);
+ dit.push_back(slices_[i]);
+ dit.top().inset_ = inset;
+ if (i + 1 != n)
+ inset = dit.nextInset();
+ }
+ //lyxerr << "converted:\n" << *this << endl;
+ operator=(dit);
+}
+
+
std::ostream & operator<<(std::ostream & os, DocIterator const & dit)
{
for (size_t i = 0, n = dit.depth(); i != n; ++i)
os << " " << dit.data_[i] << "\n";
return os;
}
+
+
+bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2)
+{
+ return dit1.data_ == dit2.data_;
+}
+