X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=56660919a2ce0fe1ad818d4991f8ebc7a5400eee;hb=aef78c821f0efbece98490a765c57b021cef0d8b;hp=0e37c5f5d9b2e139bba01288b1c83cf0eace2891;hpb=af1ca8405fa5d695a14fe7c4ffa0b2ddc16fbebc;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 0e37c5f5d9..56660919a2 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -100,15 +100,15 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
 		}
 	}
 
+	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,
-	                        reinterpret_cast<char_type const *>(&row.separator)[0],
-	                        reinterpret_cast<char_type const *>(&row.separator)[1],
-	                        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();
 }
@@ -120,24 +120,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());
@@ -213,25 +195,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))