Index: src/af/util/xp/ut_types.h =================================================================== RCS file: /cvsroot/abi/src/af/util/xp/ut_types.h,v retrieving revision 1.65 diff -u -r1.65 ut_types.h --- src/af/util/xp/ut_types.h 18 Jan 2002 18:05:47 -0000 1.65 +++ src/af/util/xp/ut_types.h 16 Feb 2002 01:13:03 -0000 @@ -148,10 +148,12 @@ /* Note: the following are our interpretations, not Unicode's */ /* Note: use Unicode Private Use Area 0xE000 - 0xF8FF */ -#define UCS_FIELDSTART ((UT_UCSChar)0xE000) -#define UCS_FIELDEND ((UT_UCSChar)0xE001) -#define UCS_BOOKMARKSTART ((UT_UCSChar)0xE002) -#define UCS_BOOKMARKEND ((UT_UCSChar)0xE003) +/* Note: GB18030 mandates U+E000 - U+E765 for UDAs 1, 2 and 3 */ +/* Note: BIG5-HKSCS uses U+E000 - U+F848 */ +#define UCS_FIELDSTART ((UT_UCSChar)0xF850) +#define UCS_FIELDEND ((UT_UCSChar)0xF851) +#define UCS_BOOKMARKSTART ((UT_UCSChar)0xF852) +#define UCS_BOOKMARKEND ((UT_UCSChar)0xF853) #if 1 /* try to use the unicode values for special chars */ Index: src/wp/impexp/xp/ie_imp_Text.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_Text.cpp,v retrieving revision 1.38 diff -u -r1.38 ie_imp_Text.cpp --- src/wp/impexp/xp/ie_imp_Text.cpp 17 Jan 2002 21:45:14 -0000 1.38 +++ src/wp/impexp/xp/ie_imp_Text.cpp 16 Feb 2002 01:13:07 -0000 @@ -112,7 +112,8 @@ // Surrogates UT_ASSERT(!(wc >= 0xD800 && wc <= 0xDFFF)); // Private Use Area - UT_ASSERT(!((wc >= 0xDB80 && wc <= 0xDBFF)||(wc >= 0xE000 && wc <= 0xF8FF))); + // No, Private User Area is not evil! Commenting it out for now. + /* UT_ASSERT(!((wc >= 0xDB80 && wc <= 0xDBFF)||(wc >= 0xE000 && wc <= 0xF8FF))); */ // AbiWord control characters UT_ASSERT(wc != UCS_FIELDSTART && wc != UCS_FIELDEND && wc != UCS_BOOKMARKSTART && wc != UCS_BOOKMARKEND); // Illegal characters