Fix a copy-paste error introduced in b754fb02

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index b2fec78d4096561360fb14605fa8d3d255d00e6b..c14bf9b41eabf2da281312e6e3662977757c3bc7 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -357,7 +357,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
        docstring author_latexed;
        for (size_t n = 0; n < author.size(); ++n) {
                try {
-                       author_latexed += runparams.encoding->latexChar(author[n]);
+                       author_latexed += runparams.encoding->latexChar(author[n]).first;
                } catch (EncodingException & /* e */) {
                        if (runparams.dryrun) {
                                ods << "<" << _("LyX Warning: ")
@@ -391,7 +391,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
 } //namespace anon
 
 
-int Changes::latexMarkChange(odocstream & os, BufferParams const & bparams,
+int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
                             Change const & oldChange, Change const & change,
                             OutputParams const & runparams)
 {
@@ -436,24 +436,22 @@ void Changes::lyxMarkChange(ostream & os, BufferParams const & bparams, int & co
 
        column = 0;
 
-       int const buffer_id = bparams.authors().get(change.author).buffer_id();
+       int const buffer_id = bparams.authors().get(change.author).bufferId();
 
        switch (change.type) {
                case Change::UNCHANGED:
                        os << "\n\\change_unchanged\n";
                        break;
 
-               case Change::DELETED: {
+               case Change::DELETED:
                        os << "\n\\change_deleted " << buffer_id
                                << " " << change.changetime << "\n";
                        break;
-               }
 
-               case Change::INSERTED: {
+               case Change::INSERTED:
                        os << "\n\\change_inserted " << buffer_id
                                << " " << change.changetime << "\n";
                        break;
-               }
        }
 }