Convert cursorX() and computeRowMetrics() to the new scheme

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index d4ff656449ace627c47a9365e8bd51bb122f6da9..93b0461161e4513e02ae4961093a42592bdc6e6d 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -92,7 +92,7 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
        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.trackChanges) {
+               if (bparams.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
@@ -190,8 +190,7 @@ void ParagraphMetrics::dump() const
 {
        lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl;
        for (size_t i = 0; i != rows_.size(); ++i) {
-               lyxerr << "  row " << i << ":   ";
-               rows_[i].dump();
+               lyxerr << "  row " << i << ":   " << rows_[i];
        }
 }
 
@@ -269,7 +268,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        // the specified position that is neither a newline nor an hfill,
        // the hfill will be expanded, otherwise it won't
        for (pos_type i = row.pos(); i < pos; i++) {
-               if (!par_->isNewline(i) && !par_->isHfill(i))
+               if (!par_->isNewline(i) && !par_->isEnvSeparator(i) && !par_->isHfill(i))
                        return true;
        }
        return false;