X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=01db6cb934b0be5c019ab2998300e84b5b56178a;hb=e57889ff2f38ed8e804a7e3c7e62114e31bf7715;hp=9a9ecf05529332cad5ab9367d7d3b5a29b47f7b4;hpb=26eb5092fb69464d181caaf212d6a4d9c9cff2f0;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 9a9ecf0552..01db6cb934 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -47,7 +47,6 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include "support/bind.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -86,13 +85,20 @@ void ParagraphMetrics::reset(Paragraph const & par)
 
 
 size_t ParagraphMetrics::computeRowSignature(Row const & row,
-		BufferParams const & bparams) const
+		BufferView const & bv) 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) {
+		if (par_->isInset(i)) {
+			Inset const * in = par_->getInset(i);
+			Dimension const d = in->dimension(bv);
+			int const b[] = { d.wid, d.asc, d.des };
+			crc.process_bytes(b, sizeof(b));
+		} else {
+			char_type const b[] = { par_->getChar(i) };
+			crc.process_bytes(b, sizeof(char_type));
+		}
+		if (bv.buffer().params().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
@@ -100,13 +106,14 @@ 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,
-	                        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();
@@ -194,6 +201,7 @@ int ParagraphMetrics::rightMargin(BufferView const & bv) const
 }
 
 
+// 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))