Avoid narrow boxes when using \width as box width unit

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 9a9ecf05529332cad5ab9367d7d3b5a29b47f7b4..56660919a2ce0fe1ad818d4991f8ebc7a5400eee 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -100,13 +100,14 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
                }
        }
 
+       pos_type const b1[] = { row.sel_beg, row.sel_end };
+       crc.process_bytes(b1, sizeof(b1));
+
        Dimension const & d = row.dimension();
-       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));
+       int const b2[] = { row.begin_margin_sel,
+                          row.end_margin_sel,
+                          d.wid, d.asc, d.des };
+       crc.process_bytes(b2, sizeof(b2));
        crc.process_bytes(&row.separator, sizeof(row.separator));
 
        return crc.checksum();
@@ -194,6 +195,7 @@ int ParagraphMetrics::rightMargin(BufferView const & bv) const
 }
 
 
+// FIXME: this code seems bogus. Audit and rewrite (see bug #9860).
 bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
 {
        if (!par_->isHfill(pos))