From 623038deecc2fa3022d2b29fca0faafcd1a7a89a Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Thu, 20 Sep 2007 10:30:49 +0000
Subject: [PATCH] shut down conversion warning and unicode fix.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@20375 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/sgml.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sgml.cpp b/src/sgml.cpp
index ff84339a37..347e7a11c1 100644
--- a/src/sgml.cpp
+++ b/src/sgml.cpp
@@ -125,8 +125,8 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
 	// If you know what you are doing, you can set allowed==""
 	// to disable this mangling.
 	TextClass const & tclass = buf.params().getTextClass();
-	string const allowed =
-		runparams.flavor == OutputParams::XML? ".-_:":tclass.options();
+	docstring const allowed = from_ascii(
+		runparams.flavor == OutputParams::XML? ".-_:":tclass.options());
 
 	if (allowed.empty())
 		return orig;
@@ -150,7 +150,7 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
 
 	bool mangle = false;
 	for (; it != end; ++it) {
-		char c = *it;
+		char_type c = *it;
 		if (isAlphaASCII(c) || isDigitASCII(c) || c == '-' || c == '.'
 		      || allowed.find(c) < allowed.size())
 			content += c;