* When merging two adjacent changes, the changetime is not considered,
* only the equality of the change type and author is checked (in method
* isSimilarTo(...)). If two changes are in fact merged (in method merge()),
- * the later change time is preserved.
+ * the later change time is preserved.
*/
bool Change::isSimilarTo(Change const & change)
if (l.type == Change::UNCHANGED) {
return true;
}
-
+
return l.author == r.author &&
l.changetime == r.changetime;
}
Change const & Changes::lookup(pos_type const pos) const
{
static Change const noChange = Change(Change::UNCHANGED);
-
+
ChangeTable::const_iterator it = table_.begin();
ChangeTable::const_iterator const end = table_.end();
(it + 1)->range.start = it->range.start;
(it + 1)->change.changetime = max(it->change.changetime,
- (it + 1)->change.changetime);
+ (it + 1)->change.changetime);
table_.erase(it);
// start again
it = table_.begin();
if (change.type == Change::DELETED) {
docstring str = "\\lyxdeleted{" +
bparams.authors().get(change.author).name() + "}{" +
- chgTime + "}{";
+ chgTime + "}{";
os << str;
column += str.size();
} else if (change.type == Change::INSERTED) {