char_type const b[] = { static_cast<char_type>(change.type) };
// 1 byte is enough to encode Change::Type
crc.process_bytes(b, 1);
- }
+ }
}
+ pos_type const b1[] = { row.sel_beg, row.sel_end };
+ crc.process_bytes(b1, sizeof(b1));
+
Dimension const & d = row.dimension();
- char_type const b[] = { static_cast<char_type>(row.sel_beg),
- static_cast<char_type>(row.sel_end),
- row.begin_margin_sel, row.end_margin_sel, d.wid, d.asc, d.des};
- crc.process_bytes(b, sizeof(b));
+ int const b2[] = { row.begin_margin_sel,
+ row.end_margin_sel,
+ d.wid, d.asc, d.des };
+ crc.process_bytes(b2, sizeof(b2));
+ crc.process_bytes(&row.separator, sizeof(row.separator));
return crc.checksum();
}
}
-Dimension const & ParagraphMetrics::insetDimension(Inset const * inset) const
-{
- InsetDims::const_iterator it = inset_dims_.find(inset);
- if (it != inset_dims_.end())
- return it->second;
-
- static Dimension dummy;
- return dummy;
-}
-
-
-void ParagraphMetrics::setInsetDimension(Inset const * inset,
- Dimension const & dim)
-{
- inset_dims_[inset] = dim;
-}
-
-
Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
{
LBUFERR(!rows().empty());
}
-int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
-{
- // The most special cases are handled first.
- if (Inset const * inset = par_->getInset(pos))
- return insetDimension(inset).wid;
-
- char_type const c = par_->getChar(pos);
-
- if (c == '\t')
- return 4 * theFontMetrics(font).width(' ');
-
- // Note that this function is only called in
- // RowPainter::paintText, and only used for characters that do
- // not require handling of compose chars or ligatures. It can
- // therefore be kept simple.
- return theFontMetrics(font).width(c);
-}
-
-
+// FIXME: this code seems bogus. Audit and rewrite (see bug #9860).
bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
{
if (!par_->isHfill(pos))