X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.C;h=f387cf82372680b29b23d69c91f823680e759748;hb=46bd598fc5b0b1bb61e713428c54aedf9c6e6d98;hp=6f9701139c36bad41940c77842a640bcb16ffdd0;hpb=00ffa3ca7c9c54fabe87acdee867b54974138174;p=lyx.git diff --git a/src/paragraph.C b/src/paragraph.C index 6f9701139c..f387cf8237 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -153,13 +153,12 @@ void Paragraph::write(Buffer const & buf, ostream & os, LyXFont font1(LyXFont::ALL_INHERIT, bparams.language); Change running_change = Change(Change::UNCHANGED); - time_type const curtime = current_time(); int column = 0; for (pos_type i = 0; i <= size(); ++i) { Change change = pimpl_->lookupChange(i); - Changes::lyxMarkChange(os, column, curtime, running_change, change); + Changes::lyxMarkChange(os, column, running_change, change); running_change = change; if (i == size()) @@ -1241,7 +1240,6 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf, if (style->pass_thru) os.put(c); else - // FIXME UNICODE os << sgml::escapeChar(c); } font_old = font; @@ -1410,12 +1408,6 @@ void Paragraph::setInsetOwner(InsetBase * inset) } -void Paragraph::setContentsFromPar(Paragraph const & par) -{ - pimpl_->setContentsFromPar(par); -} - - Change const Paragraph::lookupChange(pos_type pos) const { BOOST_ASSERT(pos <= size()); @@ -1447,9 +1439,9 @@ void Paragraph::acceptChanges(pos_type start, pos_type end) } -void Paragraph::rejectChange(pos_type start, pos_type end) +void Paragraph::rejectChanges(pos_type start, pos_type end) { - return pimpl_->rejectChange(start, end); + return pimpl_->rejectChanges(start, end); }