From 21e11e2495549fbdb40dabcb699b4381e68ec78c Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Sun, 22 Oct 2006 16:47:42 +0000 Subject: [PATCH] * src/text.C: fix status information output (change tracking) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15482 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/text.C | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/text.C b/src/text.C index d283c38800..88033fde0c 100644 --- a/src/text.C +++ b/src/text.C @@ -331,7 +331,6 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex, errorList.push_back(ErrorItem(_("Change tracking error"), bformat(_("Unknown author index for insertion: %1$d\n"), aid), par.id(), 0, par.size())); - change = Change(Change::UNCHANGED); } else change = Change(Change::INSERTED, bp.author_map[aid], ct); @@ -345,7 +344,6 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex, errorList.push_back(ErrorItem(_("Change tracking error"), bformat(_("Unknown author index for deletion: %1$d\n"), aid), par.id(), 0, par.size())); - change = Change(Change::UNCHANGED); } else change = Change(Change::DELETED, bp.author_map[aid], ct); @@ -368,7 +366,6 @@ void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex, Change change(Change::UNCHANGED); while (lex.isOK()) { - readParToken(buf, par, lex, token, font, change, errorList); lex.nextToken(); @@ -2357,14 +2354,12 @@ string LyXText::currentState(LCursor & cur) Paragraph const & par = cur.paragraph(); std::ostringstream os; - // FIXME: change tracking (MG) - bool const show_change = par.lookupChange(cur.pos()) != Change(Change::UNCHANGED); - if (buf.params().trackChanges) os << "[C] "; - if (show_change) { - Change change = par.lookupChange(cur.pos()); + Change change = par.lookupChange(cur.pos()); + + if (change.type != Change::UNCHANGED) { Author const & a = buf.params().authors().get(change.author); os << to_utf8(_("Change: ")) << a.name(); if (!a.email().empty()) -- 2.39.2