incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1179296 [1/2] - in /incubator/ooo/trunk/main: NOTICE hwpfilter/source/hcode.cpp hwpfilter/source/ksc5601.h
Date Wed, 05 Oct 2011 16:17:59 GMT
Author: pfg
Date: Wed Oct  5 16:17:58 2011
New Revision: 1179296

URL: http://svn.apache.org/viewvc?rev=1179296&view=rev
Log:
Use ksc5601.h header from XFree86 Project Inc. Patch contributed by Oliver-Rainer Wittmann
with minor changes

Modified:
    incubator/ooo/trunk/main/NOTICE
    incubator/ooo/trunk/main/hwpfilter/source/hcode.cpp
    incubator/ooo/trunk/main/hwpfilter/source/ksc5601.h

Modified: incubator/ooo/trunk/main/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/NOTICE?rev=1179296&r1=1179295&r2=1179296&view=diff
==============================================================================
--- incubator/ooo/trunk/main/NOTICE (original)
+++ incubator/ooo/trunk/main/NOTICE Wed Oct  5 16:17:58 2011
@@ -3,3 +3,8 @@
 
    This product includes software developed at
    The Apache Software Foundation (http://www.apache.org/).
+
+   The hwpfilter contains a KSC5601.1987-0 header contributed  
+   by the  Free Software Foundation, Inc. to the XFree86 project
+   under an MIT license. It is available from:
+      http://cvsweb.xfree86.org/cvsweb/xc/lib/X11/lcUniConv/

Modified: incubator/ooo/trunk/main/hwpfilter/source/hcode.cpp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/hwpfilter/source/hcode.cpp?rev=1179296&r1=1179295&r2=1179296&view=diff
==============================================================================
--- incubator/ooo/trunk/main/hwpfilter/source/hcode.cpp (original)
+++ incubator/ooo/trunk/main/hwpfilter/source/hcode.cpp Wed Oct  5 16:17:58 2011
@@ -48,10 +48,6 @@
 
 static hchar jaso2ks(hchar hh);
 
-/* Conversion table.  */
-#define KSC5601_HANJA  4888
-#define KSC5601_SYMBOL  986
-
 // ccvHH2ASC    code convert HWP20 to ASC(KSSM)
 
 #define HCA_HALFCH      0x3000
@@ -1184,7 +1180,7 @@ hchar ksc5601_sym_to_ucs2 (hchar input)
     ch2 = sal::static_int_cast<unsigned char>(input & 0xff);
     idx = (ch - 0xA1) * 94 + (ch2 - 0xA1);
     if (idx <= 1114 && idx >= 0){
-	hchar value = ksc5601_sym_to_ucs[idx];
+	hchar value = ksc5601_2uni_page21[idx];
 	return value ? value :  0x25a1;
     }
     return 0x25a1;
@@ -1200,7 +1196,7 @@ hchar ksc5601_han_to_ucs2 (hchar input)
     idx = (ch - 0xA1) * 94 + (ch2 - 0xA1);
     if (idx >= 3854){
 	// Hanja : row 42 - row 93 : 3854 = 94 * (42-1)
-	hchar value = ksc5601_hanja_to_ucs[idx - 3854];
+	hchar value = ksc5601_2uni_page4a[idx - 3854];
 	return value ? value : '?';
     }
     return '?';



Mime
View raw message