Fix #10778 (issue with CJK and language nesting)

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 5a15158a76290b496c444763a6234c2d7229216a..1fd248f66396c00dac5e19acaaf9c8cdf8a20a71 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -86,13 +86,20 @@ void ParagraphMetrics::reset(Paragraph const & par)
 
 
 size_t ParagraphMetrics::computeRowSignature(Row const & row,
-               BufferParams const & bparams) const
+               BufferView const & bv) const
 {
        boost::crc_32_type crc;
        for (pos_type i = row.pos(); i < row.endpos(); ++i) {
-               char_type const b[] = { par_->getChar(i) };
-               crc.process_bytes(b, sizeof(char_type));
-               if (bparams.track_changes) {
+               if (par_->isInset(i)) {
+                       Inset const * in = par_->getInset(i);
+                       Dimension const d = in->dimension(bv);
+                       int const b[] = { d.wid, d.asc, d.des };
+                       crc.process_bytes(b, sizeof(b));
+               } else {
+                       char_type const b[] = { par_->getChar(i) };
+                       crc.process_bytes(b, sizeof(char_type));
+               }
+               if (bv.buffer().params().track_changes) {
                        Change change = par_->lookupChange(i);
                        char_type const b[] = { static_cast<char_type>(change.type) };
                        // 1 byte is enough to encode Change::Type
@@ -104,9 +111,9 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
        crc.process_bytes(b1, sizeof(b1));
 
        Dimension const & d = row.dimension();
-       char_type const b2[] = { row.begin_margin_sel,
-                                row.end_margin_sel,
-                                d.wid, d.asc, d.des };
+       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));