Update tex2lyx test files

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index d0822312fb2b5421d357e38c66c6e9e8e6bf6039..85e57683df9208f20dfe80f3199d330eaf198cec 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -34,12 +34,11 @@
 #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"
@@ -47,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>
@@ -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();
 }
@@ -234,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);