Attachment #5863 for issue #13557

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

Lines 263-268 Link Here

(-)source/filter/inc/xistyle.hxx (+3 lines)
263	/** Inserts a format key exactly at the given position.	263	/** Inserts a format key exactly at the given position.
264	@descr The list will be extended, if it is too short, using the standard format key. */	264	@descr The list will be extended, if it is too short, using the standard format key. */
265	void InsertKey( sal_uInt32 nIndex, sal_uInt32 nFormatKey );	265	void InsertKey( sal_uInt32 nIndex, sal_uInt32 nFormatKey );
		266
		267	/** determine if this number format is an international built-in index */
		268	bool IsBuiltInInternational(sal_uInt32 mnIndex);
266	};	269	};
267		270
268		271




    {  64,  LANGUAGE_ENGLISH_NZ             },
    {  81,  LANGUAGE_JAPANESE               },
    {  82,  LANGUAGE_KOREAN                 },
    {  86,  LANGUAGE_CHINESE_SIMPLIFIED     },
    { 351,  LANGUAGE_PORTUGUESE             },
    { 354,  LANGUAGE_ICELANDIC              },
    { 358,  LANGUAGE_SWEDISH_FINLAND        },
    { 785,  LANGUAGE_ARABIC_SAUDI_ARABIA    },
    { 886,  LANGUAGE_CHINESE_TRADITIONAL    },
    { 972,  LANGUAGE_HEBREW                 }
};





    {   21,     NF_TIME_HHMMSS                  },  // hh:mm:ss
    {   22,     NF_DATETIME_SYSTEM_SHORT_HHMM   },  // DD.MM.YYYY hh:mm
    // 23...36 international formats
    {   30,     NF_NUMBER_STANDARD,             "[$-0411]M/D/YY",        LANGUAGE_JAPANESE },    
    {   30,     NF_NUMBER_STANDARD,             "[$-0412]M-D-YY",        LANGUAGE_KOREAN },    
    {   30,     NF_NUMBER_STANDARD,             "[$-0404]M/D/YY",        LANGUAGE_CHINESE_TRADITIONAL },    
    {   30,     NF_NUMBER_STANDARD,             "[$-0804]M/D/YY",        LANGUAGE_CHINESE_SIMPLIFIED },    

    {   31,     NF_NUMBER_STANDARD,             "[$-0411]YYYY年M月D日",   LANGUAGE_JAPANESE },
    {   31,     NF_NUMBER_STANDARD,             "[$-0412]YYYY년 M월 D일", LANGUAGE_KOREAN },
    {   31,     NF_NUMBER_STANDARD,             "[$-0404]YYYY年M月D日",   LANGUAGE_CHINESE_TRADITIONAL },
    {   31,     NF_NUMBER_STANDARD,             "[$-0804]YYYY年M月D日",   LANGUAGE_CHINESE_SIMPLIFIED },

    {   32,     NF_NUMBER_STANDARD,             "[$-0411]HH時MM分",       LANGUAGE_JAPANESE },
    {   32,     NF_NUMBER_STANDARD,             "[$-0412]H시 MM분",       LANGUAGE_KOREAN },
    {   32,     NF_NUMBER_STANDARD,             "[$-0404]HH時MM分",       LANGUAGE_CHINESE_TRADITIONAL },
    {   32,     NF_NUMBER_STANDARD,             "[$-0804]HH时MM分" ,      LANGUAGE_CHINESE_SIMPLIFIED },

    {   33,     NF_NUMBER_STANDARD,             "[$-0411]HH時MM分SS秒",       LANGUAGE_JAPANESE  },
    {   33,     NF_NUMBER_STANDARD,             "[$-0412]H시 MM분 SS초",      LANGUAGE_KOREAN  },
    {   33,     NF_NUMBER_STANDARD,             "[$-0404]HH時MM分SS秒",       LANGUAGE_CHINESE_TRADITIONAL  },
    {   33,     NF_NUMBER_STANDARD,             "[$-0804]HH时MM分SS秒",       LANGUAGE_CHINESE_SIMPLIFIED  },
    // ---
    {   37,     NF_NUMBER_STANDARD,             "#,##0 _$;-#,##0 _$",               },
    {   38,     NF_NUMBER_STANDARD,             "#,##0 _$;[RED]-#,##0 _$"           },

    {   48,     NF_NUMBER_STANDARD,             "##0.0E+0"                          },
    {   49,     NF_TEXT                         },  // @
    // 50...??? international formats
    {   55,     NF_NUMBER_STANDARD,             "[$-0411]YYYY年M月",        LANGUAGE_JAPANESE },
    {   55,     NF_NUMBER_STANDARD,             "[$-0412]YYYY-M-D",           LANGUAGE_KOREAN }, 
    {   55,     NF_NUMBER_STANDARD,             "[$-0404]AM/PM HH時MM分",   LANGUAGE_CHINESE_TRADITIONAL }, 
    {   55,     NF_NUMBER_STANDARD,             "[$-0804]AM/PM HH时MM分",   LANGUAGE_CHINESE_SIMPLIFIED }, 

    {   56,     NF_NUMBER_STANDARD,             "[$-0411]M月D日",                 LANGUAGE_JAPANESE },
    // unable to locate Korean 
    {   56,     NF_NUMBER_STANDARD,             "[$-0404]AM/PM HH時MM分SS秒",    LANGUAGE_CHINESE_TRADITIONAL  },
    {   56,     NF_NUMBER_STANDARD,             "[$-0804]AM/PM HH时MM分SS秒",    LANGUAGE_CHINESE_SIMPLIFIED }, 

    {   57,     NF_NUMBER_STANDARD,             "[$-030411]GE.M.D",              LANGUAGE_JAPANESE },
    {   57,     NF_NUMBER_STANDARD,             "[$-0412]YYYY年 M月 D日",     LANGUAGE_KOREAN }, 
    {   57,     NF_NUMBER_STANDARD,             "[$-0404]YYYY/M/D",              LANGUAGE_CHINESE_TRADITIONAL },  
    {   57,     NF_NUMBER_STANDARD,             "[$-0804]YYYY年M日",           LANGUAGE_CHINESE_SIMPLIFIED }, 

    {   58,     NF_NUMBER_STANDARD,             "[$-030411]GGGE年M月D日",  LANGUAGE_JAPANESE },
    {   58,     NF_NUMBER_STANDARD,             "[$-0412]M-D",                LANGUAGE_KOREAN }, 
    {   58,     NF_NUMBER_STANDARD,             "[$-0404]YYYY年M月D日",    LANGUAGE_CHINESE_TRADITIONAL }, 
    {   58,     NF_NUMBER_STANDARD,             "[$-0804]M月D日",           LANGUAGE_CHINESE_SIMPLIFIED } 
};



    {
        if( pCurr->mpFormat )
        {
            if(IsBuiltInInternational(pCurr->mnIndex))
            {
                if(pCurr->eLanguage != GetLanguage())
                    continue;
            }
            aFormat = (String( pCurr->mpFormat, RTL_TEXTENCODING_UTF8 ));
            
            GetFormatter().PutandConvertEntry( aFormat, nCheckPos, nType, nKey,
                LANGUAGE_ENGLISH_US, GetLanguage() );
        }
        else
            nKey = GetFormatter().GetFormatIndex( pCurr->meOffset, GetLanguage());
        InsertKey( pCurr->mnIndex, nKey );
    }
}

        maKeyVec.resize( nIndex + 1, mnStdFmt );
    maKeyVec[ nIndex ] = nFormatKey;
}
bool XclImpNumFmtBuffer::IsBuiltInInternational(sal_uInt32 mnIndex)
{
    return((mnIndex >= 30 && mnIndex <= 33) || (mnIndex >= 55 && mnIndex <= 58));
}
// XF, STYLE record - Cell formatting =========================================

void XclImpCellProt::FillFromXF2( sal_uInt8 nNumFmt )

Return to issue 13557

Lines 567-577 Link Here

(-)source/filter/excel/xltools.cxx (-1 / +2 lines)
567	{ 64, LANGUAGE_ENGLISH_NZ },	567	{ 64, LANGUAGE_ENGLISH_NZ },
568	{ 81, LANGUAGE_JAPANESE },	568	{ 81, LANGUAGE_JAPANESE },
569	{ 82, LANGUAGE_KOREAN },	569	{ 82, LANGUAGE_KOREAN },
		570	{ 86, LANGUAGE_CHINESE_SIMPLIFIED },
570	{ 351, LANGUAGE_PORTUGUESE },	571	{ 351, LANGUAGE_PORTUGUESE },
571	{ 354, LANGUAGE_ICELANDIC },	572	{ 354, LANGUAGE_ICELANDIC },
572	{ 358, LANGUAGE_SWEDISH_FINLAND },	573	{ 358, LANGUAGE_SWEDISH_FINLAND },
573	{ 785, LANGUAGE_ARABIC_SAUDI_ARABIA },	574	{ 785, LANGUAGE_ARABIC_SAUDI_ARABIA },
574	{ 886, LANGUAGE_CHINESE },	575	{ 886, LANGUAGE_CHINESE_TRADITIONAL },
575	{ 972, LANGUAGE_HEBREW }	576	{ 972, LANGUAGE_HEBREW }
576	};	577	};
577		578

Lines 533-541 Link Here

(-)source/filter/excel/xistyle.cxx (-11 / +51 lines)
533	{ 21, NF_TIME_HHMMSS }, // hh:mm:ss	533	{ 21, NF_TIME_HHMMSS }, // hh:mm:ss
534	{ 22, NF_DATETIME_SYSTEM_SHORT_HHMM }, // DD.MM.YYYY hh:mm	534	{ 22, NF_DATETIME_SYSTEM_SHORT_HHMM }, // DD.MM.YYYY hh:mm
535	// 23...36 international formats	535	// 23...36 international formats
536	{ 30, NF_NUMBER_STANDARD, "[$-0411]D/M/YY", LANGUAGE_JAPANESE }, // ???	536	{ 30, NF_NUMBER_STANDARD, "[$-0411]M/D/YY", LANGUAGE_JAPANESE },
537	{ 31, NF_NUMBER_STANDARD, "[$-0411]YYYY年M月D日", LANGUAGE_JAPANESE },	537	{ 30, NF_NUMBER_STANDARD, "[$-0412]M-D-YY", LANGUAGE_KOREAN },
538	{ 33, NF_NUMBER_STANDARD, "[$-0411]hh時mm分ss秒", LANGUAGE_JAPANESE },	538	{ 30, NF_NUMBER_STANDARD, "[$-0404]M/D/YY", LANGUAGE_CHINESE_TRADITIONAL },
		539	{ 30, NF_NUMBER_STANDARD, "[$-0804]M/D/YY", LANGUAGE_CHINESE_SIMPLIFIED },
		540
		541	{ 31, NF_NUMBER_STANDARD, "[$-0411]YYYY年M月D日", LANGUAGE_JAPANESE },
		542	{ 31, NF_NUMBER_STANDARD, "[$-0412]YYYY년 M월 D일", LANGUAGE_KOREAN },
		543	{ 31, NF_NUMBER_STANDARD, "[$-0404]YYYY年M月D日", LANGUAGE_CHINESE_TRADITIONAL },
		544	{ 31, NF_NUMBER_STANDARD, "[$-0804]YYYY年M月D日", LANGUAGE_CHINESE_SIMPLIFIED },
		545
		546	{ 32, NF_NUMBER_STANDARD, "[$-0411]HH時MM分", LANGUAGE_JAPANESE },
		547	{ 32, NF_NUMBER_STANDARD, "[$-0412]H시 MM분", LANGUAGE_KOREAN },
		548	{ 32, NF_NUMBER_STANDARD, "[$-0404]HH時MM分", LANGUAGE_CHINESE_TRADITIONAL },
		549	{ 32, NF_NUMBER_STANDARD, "[$-0804]HH时MM分" , LANGUAGE_CHINESE_SIMPLIFIED },
		550
		551	{ 33, NF_NUMBER_STANDARD, "[$-0411]HH時MM分SS秒", LANGUAGE_JAPANESE },
		552	{ 33, NF_NUMBER_STANDARD, "[$-0412]H시 MM분 SS초", LANGUAGE_KOREAN },
		553	{ 33, NF_NUMBER_STANDARD, "[$-0404]HH時MM分SS秒", LANGUAGE_CHINESE_TRADITIONAL },
		554	{ 33, NF_NUMBER_STANDARD, "[$-0804]HH时MM分SS秒", LANGUAGE_CHINESE_SIMPLIFIED },
539	// ---	555	// ---
540	{ 37, NF_NUMBER_STANDARD, "#,##0 _$;-#,##0 _$", },	556	{ 37, NF_NUMBER_STANDARD, "#,##0 _$;-#,##0 _$", },
541	{ 38, NF_NUMBER_STANDARD, "#,##0 _$;[RED]-#,##0 _$" },	557	{ 38, NF_NUMBER_STANDARD, "#,##0 _$;[RED]-#,##0 _$" },
Lines 548-556 Link Here
548	{ 48, NF_NUMBER_STANDARD, "##0.0E+0" },	564	{ 48, NF_NUMBER_STANDARD, "##0.0E+0" },
549	{ 49, NF_TEXT }, // @	565	{ 49, NF_TEXT }, // @
550	// 50...??? international formats	566	// 50...??? international formats
551	{ 56, NF_NUMBER_STANDARD, "[$-0411]M月D日", LANGUAGE_JAPANESE },	567	{ 55, NF_NUMBER_STANDARD, "[$-0411]YYYY年M月", LANGUAGE_JAPANESE },
552	{ 57, NF_NUMBER_STANDARD, "[$-030411]GE.M.D", LANGUAGE_JAPANESE },	568	{ 55, NF_NUMBER_STANDARD, "[$-0412]YYYY-M-D", LANGUAGE_KOREAN },
553	{ 58, NF_NUMBER_STANDARD, "[$-030411]GGGE年M月D日",LANGUAGE_JAPANESE }	569	{ 55, NF_NUMBER_STANDARD, "[$-0404]AM/PM HH時MM分", LANGUAGE_CHINESE_TRADITIONAL },
		570	{ 55, NF_NUMBER_STANDARD, "[$-0804]AM/PM HH时MM分", LANGUAGE_CHINESE_SIMPLIFIED },
		571
		572	{ 56, NF_NUMBER_STANDARD, "[$-0411]M月D日", LANGUAGE_JAPANESE },
		573	// unable to locate Korean
		574	{ 56, NF_NUMBER_STANDARD, "[$-0404]AM/PM HH時MM分SS秒", LANGUAGE_CHINESE_TRADITIONAL },
		575	{ 56, NF_NUMBER_STANDARD, "[$-0804]AM/PM HH时MM分SS秒", LANGUAGE_CHINESE_SIMPLIFIED },
		576
		577	{ 57, NF_NUMBER_STANDARD, "[$-030411]GE.M.D", LANGUAGE_JAPANESE },
		578	{ 57, NF_NUMBER_STANDARD, "[$-0412]YYYY年 M月 D日", LANGUAGE_KOREAN },
		579	{ 57, NF_NUMBER_STANDARD, "[$-0404]YYYY/M/D", LANGUAGE_CHINESE_TRADITIONAL },
		580	{ 57, NF_NUMBER_STANDARD, "[$-0804]YYYY年M日", LANGUAGE_CHINESE_SIMPLIFIED },
		581
		582	{ 58, NF_NUMBER_STANDARD, "[$-030411]GGGE年M月D日", LANGUAGE_JAPANESE },
		583	{ 58, NF_NUMBER_STANDARD, "[$-0412]M-D", LANGUAGE_KOREAN },
		584	{ 58, NF_NUMBER_STANDARD, "[$-0404]YYYY年M月D日", LANGUAGE_CHINESE_TRADITIONAL },
		585	{ 58, NF_NUMBER_STANDARD, "[$-0804]M月D日", LANGUAGE_CHINESE_SIMPLIFIED }
554	};	586	};
555		587
556		588
Lines 632-643 Link Here
632	{	664	{
633	if( pCurr->mpFormat )	665	if( pCurr->mpFormat )
634	{	666	{
635	aFormat = String( pCurr->mpFormat, RTL_TEXTENCODING_UTF8 );	667	if(IsBuiltInInternational(pCurr->mnIndex))
		668	{
		669	if(pCurr->eLanguage != GetLanguage())
		670	continue;
		671	}
		672	aFormat = (String( pCurr->mpFormat, RTL_TEXTENCODING_UTF8 ));
		673
636	GetFormatter().PutandConvertEntry( aFormat, nCheckPos, nType, nKey,	674	GetFormatter().PutandConvertEntry( aFormat, nCheckPos, nType, nKey,
637	LANGUAGE_ENGLISH_US, pCurr->eLanguage );	675	LANGUAGE_ENGLISH_US, GetLanguage() );
638	}	676	}
639	else	677	else
640	nKey = GetFormatter().GetFormatIndex( pCurr->meOffset, pCurr->eLanguage );	678	nKey = GetFormatter().GetFormatIndex( pCurr->meOffset, GetLanguage());
641	InsertKey( pCurr->mnIndex, nKey );	679	InsertKey( pCurr->mnIndex, nKey );
642	}	680	}
643	}	681	}
Lines 648-655 Link Here
648	maKeyVec.resize( nIndex + 1, mnStdFmt );	686	maKeyVec.resize( nIndex + 1, mnStdFmt );
649	maKeyVec[ nIndex ] = nFormatKey;	687	maKeyVec[ nIndex ] = nFormatKey;
650	}	688	}
651		689	bool XclImpNumFmtBuffer::IsBuiltInInternational(sal_uInt32 mnIndex)
652		690	{
		691	return((mnIndex >= 30 && mnIndex <= 33) \|\| (mnIndex >= 55 && mnIndex <= 58));
		692	}
653	// XF, STYLE record - Cell formatting =========================================	693	// XF, STYLE record - Cell formatting =========================================
654		694
655	void XclImpCellProt::FillFromXF2( sal_uInt8 nNumFmt )	695	void XclImpCellProt::FillFromXF2( sal_uInt8 nNumFmt )