X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=e6541fdb0b3090958fe89c035d9eb05b93cb98a1;hb=410c716bf703dae98c2064d555b9e2b7678555ee;hp=a1a01a8c10cc71e94f1ebe37b66109eb73150228;hpb=7cbeed2e40691570b5572c58ce51222d487400e6;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index a1a01a8c10..e6541fdb0b 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -34,7 +34,6 @@
 #include "sgml.h"
 #include "TextClass.h"
 #include "TexRow.h"
-#include "VSpace.h"
 
 #include "frontends/FontMetrics.h"
 
@@ -94,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();
 }
@@ -258,9 +257,8 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
 	}
 
 	// expand at the beginning of a row only if it is the first row of a paragraph
-	if (pos == row.pos()) {
+	if (pos == row.pos())
 		return pos == 0;
-	}
 
 	// do not expand in some labels
 	if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody())