Kornel's gcc compile fix.

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 34db257f583b2d63b24cf3b8f7682ec1cc73aac5..2f7feb1256243571d9f253f6201365a95e7f8494 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -256,7 +256,7 @@ Change const & Changes::lookup(pos_type const pos) const
 }
 
 
-bool Changes::isFullyDeleted(pos_type start, pos_type end) const
+bool Changes::isDeleted(pos_type start, pos_type end) const
 {
        ChangeTable::const_iterator it = table_.begin();
        ChangeTable::const_iterator const itend = table_.end();
@@ -369,7 +369,7 @@ int Changes::latexMarkChange(odocstream & os, BufferParams const & bparams,
 }
 
 
-void Changes::lyxMarkChange(ostream & os, int & column,
+void Changes::lyxMarkChange(ostream & os, BufferParams const & bparams, int & column,
                            Change const & old, Change const & change)
 {
        if (old == change)
@@ -377,19 +377,21 @@ void Changes::lyxMarkChange(ostream & os, int & column,
 
        column = 0;
 
+       int const buffer_id = bparams.authors().get(change.author).buffer_id();
+
        switch (change.type) {
                case Change::UNCHANGED:
                        os << "\n\\change_unchanged\n";
                        break;
 
                case Change::DELETED: {
-                       os << "\n\\change_deleted " << change.author
+                       os << "\n\\change_deleted " << buffer_id
                                << " " << change.changetime << "\n";
                        break;
                }
 
                case Change::INSERTED: {
-                       os << "\n\\change_inserted " << change.author
+                       os << "\n\\change_inserted " << buffer_id
                                << " " << change.changetime << "\n";
                        break;
                }