View | Details | Raw Unified | Return to issue 17498
Collapse All | Expand All

(-)ooo_1.1rc3_src/sw/source/filter/ww8/ww8par.cxx (-6 / +16 lines)
Lines 1683-1693 Link Here
1683 
            if (bVer67)
 1683 
            if (bVer67)
1684 
            {
 1684 
            {
1685 
                sal_Char aTest[2];
 1685 
                sal_Char aTest[2];
1686 
                aTest[0] = (nUCode & 0xFF00) >> 8;
 1686 
                if (nUCode >= 0x3000)
1687 
                aTest[1] = (nUCode & 0x00FF);
 1687 
                {
1688 
                String aTemp(aTest, 2, eSrcCharSet);
 1688 
                        aTest[0] = (nUCode & 0xFF00) >> 8;
1689 
                ASSERT(aTemp.Len() == 1, "so much for that theory");
 1689 
                        aTest[1] = (nUCode & 0x00FF);
1690 
                *pWork = aTemp.GetChar(0);
 1690 
                        String aTemp(aTest, 2, eSrcCharSet);
1691 
                        ASSERT(aTemp.Len() == 1, "so much for that theory");
1692 
                        *pWork = aTemp.GetChar(0);
1693 
                }
1694 
                else
1695 
                {
1696 
                        aTest[0] = (nUCode & 0x00FF);
1697 
                        String aTemp(aTest, 1, eSrcCharSet);
1698 
                        *pWork = aTemp.GetChar(0);
1699 
                }
1691 
            }
 1700 
            }
1692 
            else
 1701 
            else
1693 
			    *pWork = nUCode;
 1702 
			    *pWork = nUCode;
Lines 3188-3194 Link Here
3188 
	{
 3197 
	{
3189 
        case 6:
 3198 
        case 6:
3190 
        case 7:
 3199 
        case 7:
3191 
            if ( (0xa5dc != nMagic) && (0xa699 != nMagic) )
 3200 
            //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) )	//Takashi Ono
3201 
            if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) )
3192 
            {
 3202 
            {
3193 
                //JP 06.05.99: teste auf eigenen 97-Fake!
 3203 
                //JP 06.05.99: teste auf eigenen 97-Fake!
3194 
                if (pStg && 0xa5ec == nMagic)
 3204 
                if (pStg && 0xa5ec == nMagic)
(-)ooo_1.1rc3_src/sw/source/filter/ww8/ww8par6.cxx (-2 / +4 lines)
Lines 3373-3381 Link Here
3373 
                nId = RES_CHRATR_CTL_FONT;
 3373 
                nId = RES_CHRATR_CTL_FONT;
3374 
                break;
 3374 
                break;
3375 
            case 93:
 3375 
            case 93:
3376 
            case 111:
3376 
            case 0x4a4f:
 3377 
            case 0x4a4f:
3377 
                nId = RES_CHRATR_FONT;
 3378 
                nId = RES_CHRATR_FONT;
3378 
                break;
 3379 
                break;
3380 
            case 112:
3379 
            case 0x4a50:
 3381 
            case 0x4a50:
3380 
                nId = RES_CHRATR_CJK_FONT;
 3382 
                nId = RES_CHRATR_CJK_FONT;
3381 
                break;
 3383 
                break;
Lines 4984-4991 Link Here
4984 
                                                 //percentage to grow hps short
 4986 
                                                 //percentage to grow hps short
4985 
    {110, (FNReadRecord)0},                      //"sprmCCondHyhen", chp.ysri
 4987 
    {110, (FNReadRecord)0},                      //"sprmCCondHyhen", chp.ysri
4986 
                                                 //ysri short
 4988 
                                                 //ysri short
4987 
    {111, (FNReadRecord)0},                      //"??111",
 4989 
    {111, &SwWW8ImplReader::Read_FontCode},      //ww7 font
4988 
    {112, (FNReadRecord)0},                      //"??112",
 4990 
    {112, &SwWW8ImplReader::Read_FontCode},      //ww7 CJK font
4989 
    {113, &SwWW8ImplReader::Read_FontCode},      //ww7 rtl font
 4991 
    {113, &SwWW8ImplReader::Read_FontCode},      //ww7 rtl font
4990 
    {114, (FNReadRecord)0},                      //"??114",
 4992 
    {114, (FNReadRecord)0},                      //"??114",
4991 
    {115, &SwWW8ImplReader::Read_TxtColor},      //ww7 rtl colour ?
 4993 
    {115, &SwWW8ImplReader::Read_TxtColor},      //ww7 rtl colour ?

Return to issue 17498