1 files changed, 63 insertions, 0 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-word6+95-cjkhandling b/editors/openoffice-1.1-devel/files/patch-word6+95-cjkhandling
new file mode 100644
index 000000000000..9a86ffb7da9d
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-word6+95-cjkhandling
@@ -0,0 +1,63 @@
+--- ../sw/source/filter/ww8/ww8par.cxx	9 Jul 2003 11:06:44 -0000	1.114
++++ ../sw/source/filter/ww8/ww8par.cxx	25 Jul 2003 22:54:52 -0000
+@@ -1683,11 +1683,20 @@
+             if (bVer67)
+             {
+                 sal_Char aTest[2];
+-                aTest[0] = (nUCode & 0xFF00) >> 8;
+-                aTest[1] = (nUCode & 0x00FF);
+-                String aTemp(aTest, 2, eSrcCharSet);
+-                ASSERT(aTemp.Len() == 1, "so much for that theory");
+-                *pWork = aTemp.GetChar(0);
++                if (nUCode >= 0x3000)
++                {
++                        aTest[0] = (nUCode & 0xFF00) >> 8;
++                        aTest[1] = (nUCode & 0x00FF);
++                        String aTemp(aTest, 2, eSrcCharSet);
++                        ASSERT(aTemp.Len() == 1, "so much for that theory");
++                        *pWork = aTemp.GetChar(0);
++                }
++                else
++                {
++                        aTest[0] = (nUCode & 0x00FF);
++                        String aTemp(aTest, 1, eSrcCharSet);
++                        *pWork = aTemp.GetChar(0);
++                }
+             }
+             else
+ 			    *pWork = nUCode;
+@@ -3188,7 +3197,8 @@
+ 	{
+         case 6:
+         case 7:
+-            if ( (0xa5dc != nMagic) && (0xa699 != nMagic) )
++            //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) )	//Takashi Ono
++            if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) )
+             {
+                 //JP 06.05.99: teste auf eigenen 97-Fake!
+                 if (pStg && 0xa5ec == nMagic)
+--- ../sw/source/filter/ww8/ww8par6.cxx	20 Jun 2003 09:38:07 -0000	1.138
++++ ../sw/source/filter/ww8/ww8par6.cxx	25 Jul 2003 22:55:05 -0000
+@@ -3373,9 +3373,11 @@
+                 nId = RES_CHRATR_CTL_FONT;
+                 break;
+             case 93:
++            case 111:
+             case 0x4a4f:
+                 nId = RES_CHRATR_FONT;
+                 break;
++            case 112:
+             case 0x4a50:
+                 nId = RES_CHRATR_CJK_FONT;
+                 break;
+@@ -4984,8 +4986,8 @@
+                                                  //percentage to grow hps short
+     {110, (FNReadRecord)0},                      //"sprmCCondHyhen", chp.ysri
+                                                  //ysri short
+-    {111, (FNReadRecord)0},                      //"??111",
+-    {112, (FNReadRecord)0},                      //"??112",
++    {111, &SwWW8ImplReader::Read_FontCode},      //ww7 font
++    {112, &SwWW8ImplReader::Read_FontCode},      //ww7 CJK font
+     {113, &SwWW8ImplReader::Read_FontCode},      //ww7 rtl font
+     {114, (FNReadRecord)0},                      //"??114",
+     {115, &SwWW8ImplReader::Read_TxtColor},      //ww7 rtl colour ?