X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=85e57683df9208f20dfe80f3199d330eaf198cec;hb=4e69b9bac5e970572b9cf9169e3db9060c47e3b6;hp=16f2fb2713b0c5224905594ff4ad162e2ff7b9c7;hpb=8f3acbb4842ff31d1229eec8fba4890be743f2d9;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 16f2fb2713..85e57683df 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -31,16 +31,14 @@
 #include "LyXRC.h"
 #include "Row.h"
 #include "OutputParams.h"
-#include "paragraph_funcs.h"
 #include "sgml.h"
 #include "TextClass.h"
 #include "TexRow.h"
-#include "VSpace.h"
 
 #include "frontends/FontMetrics.h"
 
 #include "insets/InsetBibitem.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
 
 #include "support/lassert.h"
 #include "support/debug.h"
@@ -48,7 +46,7 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -95,17 +93,17 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
 		crc.process_bytes(b, sizeof(char_type));
 		if (bparams.trackChanges) {
 			Change change = par_->lookupChange(i);
-			char_type const b[] = { change.type };
+			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[] = { row.sel_beg, row.sel_end, 
+	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};
-	// Each of the variable to process is 4 bytes: 4x7 = 28
-	crc.process_bytes(b, 28);
+	crc.process_bytes(b, sizeof(b));
 
 	return crc.checksum();
 }
@@ -235,7 +233,7 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
 				c = par_->transformChar(c, pos);
 		} else if (language->lang() == "hebrew" &&
 				Encodings::isHebrewComposeChar(c)) {
-			return 0;	
+			return 0;
 		}
 	}
 	return theFontMetrics(font).width(c);