#include "insets/InsetTabular.h"
#include "support/debug.h"
+#include "support/ExceptionMessage.h"
+#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.h"
: boundary_(false), inset_(0), buffer_(0)
{}
+
// We could be able to get rid of this if only every BufferView were
// associated to a buffer on construction.
DocIterator::DocIterator(Buffer * buf)
DocIterator dit(buffer);
size_t const n = slices_.size();
for (size_t i = 0 ; i != n; ++i) {
- LASSERT(inset, /**/);
+ LBUFERR(inset);
dit.push_back(slices_[i]);
dit.top().inset_ = inset;
if (i + 1 != n)
Inset * DocIterator::realInset() const
{
- LASSERT(inTexted(), /**/);
+ LASSERT(inTexted(), return 0);
// if we are in a tabular, we need the cell
if (inset().lyxCode() == TABULAR_CODE) {
InsetTabular * tabular = inset().asInsetTabular();
Text * DocIterator::text() const
{
- LASSERT(!empty(), /**/);
+ LASSERT(!empty(), return 0);
return top().text();
}
Paragraph & DocIterator::paragraph() const
{
- if (!inTexted())
+ if (!inTexted()) {
LYXERR0(*this);
- LASSERT(inTexted(), /**/);
+ LBUFERR(false);
+ }
return top().paragraph();
}
Paragraph & DocIterator::innerParagraph() const
{
- LASSERT(!empty(), /**/);
+ LBUFERR(!empty());
return innerTextSlice().paragraph();
}
CursorSlice const & DocIterator::innerTextSlice() const
{
- LASSERT(!empty(), /**/);
+ LBUFERR(!empty());
// go up until first non-0 text is hit
// (innermost text is 0 in mathed)
for (int i = depth() - 1; i >= 0; --i)
// This case is in principe not possible. We _must_
// be inside a Text.
- LASSERT(false, /**/);
- static CursorSlice dummy;
- return dummy;
+ LBUFERR(false);
+ // Squash warning
+ static const CursorSlice c;
+ return c;
}
Text * DocIterator::innerText() const
{
- LASSERT(!empty(), /**/);
+ LASSERT(!empty(), return 0);
return innerTextSlice().text();
}
size_t const n = slices_.size();
slices_.resize(0);
for (size_t i = 0 ; i < n; ++i) {
- LASSERT(inset, /**/);
+ LBUFERR(inset);
push_back(dit[i]);
top().inset_ = inset;
if (i + 1 != n)
void DocIterator::sanitize()
{
- // this function re-creates the cache of inset pointers
- //lyxerr << "converting:\n" << *this << endl;
+ // keep a copy of the slices
+ vector<CursorSlice> const sl = slices_;
+ slices_.clear();
if (buffer_)
inset_ = &buffer_->inset();
Inset * inset = inset_;
- for (size_t i = 0, n = slices_.size(); i != n; ++i) {
+ // re-add the slices one by one, and adjust the inset pointer.
+ for (size_t i = 0, n = sl.size(); i != n; ++i) {
if (inset == 0) {
// FIXME
LYXERR0(" Should not happen, but does e.g. after "
fixIfBroken();
break;
}
- slices_[i].inset_ = inset;
+ push_back(sl[i]);
+ top().inset_ = inset;
if (fixIfBroken())
break;
if (i + 1 != n)
- inset = slices_[i].inset().inMathed() ? slices_[i].cell()[slices_[i].pos()].nucleus()
- : slices_[i].paragraph().getInset(pos());
+ inset = nextInset();
}
- //lyxerr << "convert:\n" << *this << " to:\n" << dit << endl;
}
DocIterator StableDocIterator::asDocIterator(Buffer * buf) const
{
- DocIterator dit = DocIterator(buf);
+ DocIterator dit(buf);
dit.slices_ = data_;
dit.sanitize();
return dit;