--- parser3/src/include/pa_charset.h	2003/03/21 14:49:00	1.20.2.18.2.2
+++ parser3/src/include/pa_charset.h	2003/03/25 09:34:53	1.20.2.18.2.4
@@ -8,7 +8,7 @@
 #ifndef PA_CHARSET_H
 #define PA_CHARSET_H
 
-static const char* IDENT_CHARSET_H="$Date: 2003/03/21 14:49:00 $";
+static const char* IDENT_CHARSET_H="$Date: 2003/03/25 09:34:53 $";
 
 
 #include "pa_exception.h"
@@ -65,7 +65,7 @@ public:
 	);
 
 #ifdef XML
-	xmlCharEncodingHandler& transcoder(const String* source);
+	xmlCharEncodingHandler& transcoder(const String& name);
 #endif
 
 public:
@@ -108,25 +108,17 @@ private:
 
 private:
 	void addEncoding(char* name_cstr);
-	void initTranscoder(const String* source, const char* name_cstr);
+	void initTranscoder(const String& name, const char* name_cstr);
 	
 public:
 	/// converts GdomeDOMString string to char* 
 	const char* transcode_cstr(GdomeDOMString* s);
 	/// converts GdomeDOMString string to parser String
-	const String& transcode(GdomeDOMString* s
-#ifndef NO_STRING_ORIGIN
-		, const String& origin
-#endif
-		);
+	const String& transcode(GdomeDOMString* s);
 	/// converts xmlChar* null-terminated string to char* 
 	const char* transcode_cstr(xmlChar* s);
 	/// converts xmlChar* null-terminated string to parser String
-	const String& transcode(xmlChar* s
-#ifndef NO_STRING_ORIGIN
-		, const String& origin
-#endif
-		);
+	const String& transcode(xmlChar* s);
 
 	/** converts sized char*  to xmlChar*
 		@returns xmlChar*  WHICH CALLER SHOULD FREE
@@ -140,6 +132,8 @@ public:
 	GdomeDOMString_auto_ptr transcode_buf2dom(const char* buf, size_t buf_size);
 	/// converts parser String to GdomeDOMString
 	GdomeDOMString_auto_ptr transcode(const String& s);
+	/// converts parser StringBody to GdomeDOMString
+	GdomeDOMString_auto_ptr transcode(const StringBody s);
 
 private: