Buffer: Rename function names:

[lyx.git] / src / output_xhtml.cpp

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index d4aa779fca2986d99b1f0ba315240ac43eefb087..f6ab5a5a02ff72942d4aef3be0d78393e3825bf5 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -292,8 +292,10 @@ XHTMLStream & XHTMLStream::operator<<(char c)
        if (nextraw_) {
                os_ << c;
                nextraw_ = false;
-       } else
-               os_ << html::escapeChar(c);
+       } else {
+               string const d = html::escapeChar(c);
+               os_ << from_ascii(d);
+       }
        return *this;
 }
 
@@ -844,7 +846,7 @@ void makeCommand(Buffer const & buf,
                xs << pbegin->params().labelString();
                closeLabelTag(xs, style);
                // Otherwise the label might run together with the text
-               xs << ' ';
+               xs << from_ascii(" ");
        }
 
        ParagraphList::const_iterator const begin = text.paragraphs().begin();