Update my email and status.

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 15ed5f5d026b3f16c2906c465cf9d313531d792a..e6541fdb0b3090958fe89c035d9eb05b93cb98a1 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -4,13 +4,13 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  * \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -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>
@@ -96,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, 
-               row.left_margin_sel, row.right_margin_sel, d.wid, d.asc, d.des};
-       // Each of the variable to process is 4 bytes: 4x7 = 28
-       crc.process_bytes(b, 28);
+       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));
 
        return crc.checksum();
 }
@@ -236,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);
@@ -260,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())