diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2004-03-15 12:53:04 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2004-03-15 12:53:04 +0000 |
| commit | a66ae315f405127cd1f9d9e5512407666ffd1e1f (patch) | |
| tree | bcebb56f2dd34753e00c7dd27eaba31dd1313bfa /editors/openoffice-1.1/files | |
| parent | Modified so that correctly apply (diff) | |
modified so that applies cleanly
Notes
Notes:
svn path=/head/; revision=104083
Diffstat (limited to 'editors/openoffice-1.1/files')
| -rw-r--r-- | editors/openoffice-1.1/files/patch-word6+95-cjkhandling | 68 |
1 files changed, 29 insertions, 39 deletions
diff --git a/editors/openoffice-1.1/files/patch-word6+95-cjkhandling b/editors/openoffice-1.1/files/patch-word6+95-cjkhandling index 9a86ffb7da9d..b2fdcc03faaa 100644 --- a/editors/openoffice-1.1/files/patch-word6+95-cjkhandling +++ b/editors/openoffice-1.1/files/patch-word6+95-cjkhandling @@ -1,41 +1,31 @@ --- ../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) +@@ -1774,11 +1774,20 @@ + if (nUCode >= 0x3000) //0x8000 ? + { + 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 + { --- ../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 @@ @@ -50,12 +40,12 @@ case 0x4a50: nId = RES_CHRATR_CJK_FONT; break; -@@ -4984,8 +4986,8 @@ +@@ -5104,8 +5106,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_BoldBiDiUsw}, //"111 bidi bold ?", +- {112, &SwWW8ImplReader::Read_BoldBiDiUsw}, //"112 bidi italic ?", + {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font + {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font |