X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=72b212b10cde88f924d0da585396452f8d2d6e2d;hb=2b02b73f4a59bb73f9e819a960ea98c86ef8716f;hp=56660919a2ce0fe1ad818d4991f8ebc7a5400eee;hpb=ffc693c87ff17d8826befba9db7106cfc7bda900;p=lyx.git diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp index 56660919a2..72b212b10c 100644 --- a/src/ParagraphMetrics.cpp +++ b/src/ParagraphMetrics.cpp @@ -31,7 +31,7 @@ #include "LyXRC.h" #include "Row.h" #include "OutputParams.h" -#include "sgml.h" +#include "xml.h" #include "TextClass.h" #include "TexRow.h" @@ -47,9 +47,6 @@ #include "support/lstrings.h" #include "support/textutils.h" -#include "support/bind.h" -#include - #include #include #include @@ -85,60 +82,12 @@ void ParagraphMetrics::reset(Paragraph const & par) } -size_t ParagraphMetrics::computeRowSignature(Row const & row, - BufferParams const & bparams) 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) { - Change change = par_->lookupChange(i); - char_type const b[] = { static_cast(change.type) }; - // 1 byte is enough to encode Change::Type - crc.process_bytes(b, 1); - } - } - - pos_type const b1[] = { row.sel_beg, row.sel_end }; - crc.process_bytes(b1, sizeof(b1)); - - Dimension const & d = row.dimension(); - 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(); -} - - void ParagraphMetrics::setPosition(int position) { position_ = position; } -Row & ParagraphMetrics::getRow(pos_type pos, bool boundary) -{ - LBUFERR(!rows().empty()); - - // If boundary is set we should return the row on which - // the character before is inside. - if (pos > 0 && boundary) - --pos; - - RowList::iterator rit = rows_.end(); - RowList::iterator const begin = rows_.begin(); - - for (--rit; rit != begin && rit->pos() > pos; --rit) - ; - - return *rit; -} - - Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const { LBUFERR(!rows().empty());