X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=ad217cfa604765859e3ac459646636173a4e44ee;hb=0407364392abca866ee5a3da3c89ad41811ed81f;hp=77e126eed279caf63b933ba35188589bac45653e;hpb=3830ce46db8b32003728b792e8b7c8e6c6d55561;p=lyx.git diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp index 77e126eed2..ad217cfa60 100644 --- a/src/ParagraphMetrics.cpp +++ b/src/ParagraphMetrics.cpp @@ -119,24 +119,6 @@ void ParagraphMetrics::setPosition(int position) } -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()); @@ -212,25 +194,7 @@ int ParagraphMetrics::rightMargin(BufferView const & bv) const } -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))