diff options
Diffstat (limited to 'editors/openoffice.org-1.1-devel/files/patch-word6+95-cjkhandling')
-rw-r--r-- | editors/openoffice.org-1.1-devel/files/patch-word6+95-cjkhandling | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/editors/openoffice.org-1.1-devel/files/patch-word6+95-cjkhandling b/editors/openoffice.org-1.1-devel/files/patch-word6+95-cjkhandling deleted file mode 100644 index b2fdcc03faaa..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-word6+95-cjkhandling +++ /dev/null @@ -1,53 +0,0 @@ ---- ../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 -@@ -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 @@ - 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; -@@ -5104,8 +5106,8 @@ - //percentage to grow hps short - {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri - //ysri short -- {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 - {114, (FNReadRecord)0}, //"??114", - {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? |