X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=eeccf9de37fad59bca7ed82d3fb998850bb8c82a;hb=f8cc30a1f20de97425d17fc1779041d0f963f74a;hp=3d4bc274dc4d70b32c3127937c8546de5738f2a2;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 3d4bc274dc..eeccf9de37 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -31,25 +31,22 @@
 #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/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -105,8 +102,7 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
 	Dimension const & d = row.dimension();
 	char_type const b[] = { row.sel_beg, 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();
 }
@@ -236,7 +232,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);