X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=0cbe3e9a76d60f7ca316bd3ad0d719b7f79e80ab;hb=c6b17b7094c42ff6bf96e3452f69023c724d15b7;hp=a911d145773c558cc311bc54a1af16d90f2263b8;hpb=81badf8550f2fd5e614a22261c4885d747a72106;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index a911d14577..0cbe3e9a76 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -31,7 +31,7 @@
 #include "LyXRC.h"
 #include "Row.h"
 #include "OutputParams.h"
-#include "sgml.h"
+#include "xml.h"
 #include "TextClass.h"
 #include "TexRow.h"
 
@@ -47,9 +47,6 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include "support/bind.h"
-#include <boost/crc.hpp>
-
 #include <algorithm>
 #include <list>
 #include <stack>
@@ -85,58 +82,12 @@ void ParagraphMetrics::reset(Paragraph const & par)
 }
 
 
-size_t ParagraphMetrics::computeRowSignature(Row const & row,
-		BufferParams const & bparams) const
-{
-	boost::crc_32_type crc;
-	for (pos_type i = row.pos(); i < row.endpos(); ++i) {
-		char_type const b[] = { par_->getChar(i) };
-		crc.process_bytes(b, sizeof(char_type));
-		if (bparams.track_changes) {
-			Change change = par_->lookupChange(i);
-			char_type const b[] = { static_cast<char_type>(change.type) };
-			// 1 byte is enough to encode Change::Type
-			crc.process_bytes(b, 1);
-		}
-	}
-
-	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,
-	                        row.separator,
-	                        d.wid, d.asc, d.des };
-	crc.process_bytes(b, sizeof(b));
-
-	return crc.checksum();
-}
-
-
 void ParagraphMetrics::setPosition(int position)
 {
 	position_ = 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 +163,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))