#include "insets/InsetTabular.h"
#include "support/debug.h"
+#include "support/ExceptionMessage.h"
+#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.h"
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)
if (slices_[i].text())
return slices_[i];
- // This case is in principe not possible. We _must_
+ // This case is in principle 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)