From 12ce8e82cf1aad7fc5ce090ad78b1556bf5b5c95 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Mon, 14 Jan 2008 23:44:05 +0000 Subject: [PATCH] simplify ucs4 to utf8 conversion. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22577 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Paragraph.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index aeece98bdd..4f4d9ff563 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -53,7 +53,6 @@ #include "support/lstrings.h" #include "support/Messages.h" #include "support/textutils.h" -#include "support/unicode.h" #include #include @@ -1158,11 +1157,9 @@ void Paragraph::write(Buffer const & buf, ostream & os, } // this check is to amend a bug. LyX sometimes // inserts '\0' this could cause problems. - if (c != '\0') { - vector tmp = ucs4_to_utf8(c); - tmp.push_back('\0'); - os << &tmp[0]; - } else + if (c != '\0') + os << to_utf8(docstring(1, c)); + else lyxerr << "ERROR (Paragraph::writeFile):" " NULL char in structure." << endl; ++column;