--- ../dist/OOO_2_0_3/svx/source/svdraw/svdfppt.cxx 2006-05-04 11:11:58.000000000 +0200 +++ ../dist/OOO_2_0_3/svx/source/svdraw/svdfppt.cxx 2006-10-11 15:20:14.187500000 +0200 @@ -299,6 +299,9 @@ using namespace drawing ; using namespace container ; +// Ugly global variable for i37316 +SvxLanguageItem PPT_FORMAT_LANG ( LANGUAGE_ENGLISH ); + //////////////////////////////////////////////////////////////////////////////////////////////////// PowerPointImportParam::PowerPointImportParam( SvStream& rDocStrm, sal_uInt32 nFlags, MSFilterTracer* pT ) : @@ -5845,6 +5854,8 @@ rSet.Put( SvxLanguageItem( mnLanguage[ 1 ], EE_CHAR_LANGUAGE_CJK ) ); if ( mnLanguage[ 2 ] ) rSet.Put( SvxLanguageItem( mnLanguage[ 2 ], EE_CHAR_LANGUAGE_CTL ) ); + + PPT_FORMAT_LANG.SetLanguage( mnLanguage[ 0 ] ); } SvxFieldItem* PPTPortionObj::GetTextField() @@ -6462,40 +6473,69 @@ { eDateFormat = SVXDATEFORMAT_APPDEFAULT; eTimeFormat = SVXTIMEFORMAT_APPDEFAULT; - // ID auswerten - switch( nVal ) + + // for i37316 + + int nTmp = nVal - 7; + if ( PPT_FORMAT_LANG.GetLanguage() == LANGUAGE_HEBREW) { - case 0: - case 6: - eDateFormat = SVXDATEFORMAT_A; - break; - case 1: - eDateFormat = SVXDATEFORMAT_F; - break; - case 2: - case 3: - eDateFormat = SVXDATEFORMAT_D; - break; - case 4: - case 5: - eDateFormat = SVXDATEFORMAT_C; - break; - case 7: - eDateFormat = SVXDATEFORMAT_A; - case 9: - eTimeFormat = SVXTIMEFORMAT_24_HM; - break; - case 8: - eDateFormat = SVXDATEFORMAT_A; - case 11: - eTimeFormat = SVXTIMEFORMAT_12_HM; - break; - case 10: - eTimeFormat = SVXTIMEFORMAT_24_HMS; - break; - case 12: - eTimeFormat = SVXTIMEFORMAT_12_HMS; - break; + switch( nTmp ) + { + case 0: + case 1: + case 2: + eDateFormat = SVXDATEFORMAT_A; + break; + case 3: + eDateFormat = SVXDATEFORMAT_F; + break; + case 4: + eDateFormat = SVXDATEFORMAT_A; + eTimeFormat = SVXTIMEFORMAT_24_HM; + break; + case 5: + eDateFormat = SVXDATEFORMAT_A; + break; + } + } + else + { + switch( nVal ) + { + case 0: + case 6: + eDateFormat = SVXDATEFORMAT_A; + break; + case 1: + eDateFormat = SVXDATEFORMAT_F; + break; + case 2: + case 3: + eDateFormat = SVXDATEFORMAT_D; + break; + case 4: + case 5: + eDateFormat = SVXDATEFORMAT_C; + break; + case 7: + eDateFormat = SVXDATEFORMAT_A; + case 9: + eTimeFormat = SVXTIMEFORMAT_24_HM; + break; + case 8: + eDateFormat = SVXDATEFORMAT_A; + case 11: + eTimeFormat = SVXTIMEFORMAT_12_HM; + break; + case 10: + eTimeFormat = SVXTIMEFORMAT_24_HMS; + break; + case 12: + eTimeFormat = SVXTIMEFORMAT_12_HMS; + break; + + break; + } } }