INTEGRATION: CWS gt08hangulhanja (1.2.4); FILE MERGED

2004/10/15 16:27:03 tl 1.2.4.3: RESYNC: (1.2-1.3); FILE MERGED
2004/06/21 13:37:30 tl 1.2.4.2: #i28900# calling uscript_getScript now in checkScriptType
2004/05/07 12:41:52 tl 1.2.4.1: #116074# check if dictionary is active added; ScriptTypeList list updatet to latest version

1 files changed, 16 insertions, 32 deletions

diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 10222accfcb0..b51cbf65d93e 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hhconvdic.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2004-09-17 13:34:57 $
+ *  last change: $Author: rt $ $Date: 2004-11-26 14:29:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,10 @@
  *
  ************************************************************************/
 
+#ifndef USCRIPT_H
+#include <external/unicode/uscript.h>
+#endif
+
 #ifndef _LANG_HXX //autogen wg. LANGUAGE_ENGLISH_US
 #include <tools/lang.hxx>
 #endif
@@ -138,40 +142,20 @@ using namespace i18n;
 #define SCRIPT_HANGUL   2
 
 // from i18npool/source/textconversion/textconversion_ko.cxx
-sal_Int16 SAL_CALL checkScriptType(sal_Unicode c)
+sal_Int16 SAL_CALL checkScriptType(sal_Unicode c) throw (RuntimeException)
 {
-    static ScriptTypeList typeList[] = {
-        { UnicodeScript_kHangulJamo, SCRIPT_HANGUL }, // 29
-        { UnicodeScript_kCJKRadicalsSupplement, SCRIPT_HANJA },     // 57,
-        { UnicodeScript_kKangxiRadicals,        SCRIPT_HANJA },     // 58,
-        { UnicodeScript_kIdeographicDescriptionCharacters, SCRIPT_HANJA },  // 59,
-        { UnicodeScript_kCJKSymbolPunctuation,  SCRIPT_HANJA },     // 60,
-        { UnicodeScript_kHiragana,          SCRIPT_HANJA },     // 61,
-        { UnicodeScript_kKatakana,          SCRIPT_HANJA },     // 62,
-        { UnicodeScript_kBopomofo,          SCRIPT_HANJA },     // 63,
-        { UnicodeScript_kHangulCompatibilityJamo,   SCRIPT_HANGUL },        // 64,
-        { UnicodeScript_kKanbun,            SCRIPT_HANJA },     // 65,
-        { UnicodeScript_kBopomofoExtended,      SCRIPT_HANJA },     // 66,
-        { UnicodeScript_kEnclosedCJKLetterMonth,    SCRIPT_HANJA },     // 67,
-        { UnicodeScript_kCJKCompatibility,      SCRIPT_HANJA },     // 68,
-        { UnicodeScript_k_CJKUnifiedIdeographsExtensionA, SCRIPT_HANJA },   // 69,
-        { UnicodeScript_kCJKUnifiedIdeograph,   SCRIPT_HANJA },     // 70,
-        { UnicodeScript_kYiSyllables,       SCRIPT_HANJA },     // 71,
-        { UnicodeScript_kYiRadicals,        SCRIPT_HANJA },     // 72,
-        { UnicodeScript_kHangulSyllable,        SCRIPT_HANGUL },        // 73,
-        { UnicodeScript_kCJKCompatibilityIdeograph, SCRIPT_HANJA },     // 78,
-        { UnicodeScript_kCombiningHalfMark,     SCRIPT_HANJA },     // 81,
-        { UnicodeScript_kCJKCompatibilityForm,  SCRIPT_HANJA },     // 82,
-        { UnicodeScript_kSmallFormVariant,      SCRIPT_HANJA },     // 83,
-        { UnicodeScript_kHalfwidthFullwidthForm,    SCRIPT_HANJA },     // 86,
-
-        { UnicodeScript_kScriptCount, SCRIPT_OTHERS } // 87,
-    };
-
-    return unicode::getUnicodeScriptType(c, typeList, SCRIPT_OTHERS);
+  UErrorCode status = U_ZERO_ERROR;
+
+  UScriptCode scriptCode = uscript_getScript(c, &status);
+
+  if ( !U_SUCCESS(status) ) throw RuntimeException();
+
+  return scriptCode == USCRIPT_HANGUL ? SCRIPT_HANGUL :
+            scriptCode == USCRIPT_HAN ? SCRIPT_HANJA : SCRIPT_OTHERS;
 }
 
 
+
 BOOL TextIsAllScriptType( const OUString &rTxt, INT16 nScriptType )
 {
     BOOL bIsAll = TRUE;