8244324: RTFEditorKit does not display some of Japanese characters co…

…rrectly Reviewed-by: serb, psadhukhan
openjdk · Jul 2, 2020 · 5fbac4a · 5fbac4a
1 parent 911c553
commit 5fbac4a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java
@@ -133,6 +133,7 @@ class RTFReader extends RTFParser
   static boolean useNeXTForAnsi = false;
   static {
       characterSets = new Hashtable<String, char[]>();
+      defineCharacterSet("ansicpg", latin1TranslationTable);
   }
 
 /* TODO: per-font font encodings ( \fcharset control word ) ? */
@@ -487,6 +488,11 @@ public boolean handleKeyword(String keyword, int parameter)
         keyword.equals("private"))
         ignoreGroupIfUnknownKeywordSave = true;
 
+     if (keyword.contains("ansicpg")) {
+         setCharacterSet("ansicpg");
+         return true;
+     }
+
     if (rtfDestination != null) {
         if(rtfDestination.handleKeyword(keyword, parameter))
             return true;